[gnome-network] Ubuntu (new upstream) gnome-nettool 3.0.1-0ubuntu1
- From: Ubuntu Merge-o-Matic <mom ubuntu com>
- To: gnome-nettool packages qa debian org
- Subject: [gnome-network] Ubuntu (new upstream) gnome-nettool 3.0.1-0ubuntu1
- Date: Thu, 16 Feb 2012 05:19:34 -0000
This e-mail has been sent due to an upload to Ubuntu of a new upstream
version which still contains Ubuntu changes. It contains the difference
between the Ubuntu version and the equivalent base version in Debian, note
that this difference may include the upstream changes.
Format: 1.8
Date: Thu, 16 Feb 2012 12:31:21 +1100
Source: gnome-nettool
Binary: gnome-nettool
Architecture: source
Version: 3.0.1-0ubuntu1
Distribution: precise
Urgency: low
Maintainer: Ubuntu Desktop Team <ubuntu-desktop lists ubuntu com>
Changed-By: Robert Ancell <robert ancell canonical com>
Description:
gnome-nettool - network information tool for GNOME
Changes:
gnome-nettool (3.0.1-0ubuntu1) precise; urgency=low
.
* New upstream release
* debian/watch:
- Update to use .xz source archive
* debian/patches/01_network-manager.patch:
* debian/patches/03_fix_ifaces.patch:
- Applied upstream
Checksums-Sha1:
c6c9aacba7b917ffdd60b58c5cc9d1f3059a686a 1745 gnome-nettool_3.0.1-0ubuntu1.dsc
aa7b2d59d2175a1481196c2374c8aca7e62475bc 579848 gnome-nettool_3.0.1.orig.tar.xz
c7d9dc883a1ccecfc58c129501e6140bae19953a 10349 gnome-nettool_3.0.1-0ubuntu1.debian.tar.gz
Checksums-Sha256:
67cffd425859a486ba28fb3a9bdafdd8a62a1a4f4986a0f4e4385e1ad356edcc 1745 gnome-nettool_3.0.1-0ubuntu1.dsc
2c21b44b351ee470226e1e5580bb9acf0326d9b6c3040deff75322f8ca132317 579848 gnome-nettool_3.0.1.orig.tar.xz
7d4eb504283bee72f936a2ad002389cee1c9a9ba688e4bf60cacc0bad3deb691 10349 gnome-nettool_3.0.1-0ubuntu1.debian.tar.gz
Files:
60d672d3a70e701f08628b923a4d6e06 1745 gnome optional gnome-nettool_3.0.1-0ubuntu1.dsc
922e7554102096f24a3519c93a8257fa 579848 gnome optional gnome-nettool_3.0.1.orig.tar.xz
9f61a196bc97270e0b375dcf58b812f2 10349 gnome optional gnome-nettool_3.0.1-0ubuntu1.debian.tar.gz
Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers lists alioth debian org>
diff -pruN 3.0.0-2/aclocal.m4 3.0.1-0ubuntu1/aclocal.m4
--- 3.0.0-2/aclocal.m4 2011-04-04 08:31:32.000000000 +0000
+++ 3.0.1-0ubuntu1/aclocal.m4 2012-01-03 09:26:45.000000000 +0000
@@ -13,1858 +13,1860 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
-[m4_warning([this file was generated for autoconf 2.67.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+[m4_warning([this file was generated for autoconf 2.68.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-#
-# Copyright © 2004 Scott James Remnant <scott netsplit com>.
-#
-# 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) 1995-2002 Free Software Foundation, Inc.
+# Copyright (C) 2001-2003,2004 Red Hat, 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, 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.
#
-# 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)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-
-if test "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
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# 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.
#
-# Check to see whether a particular set of modules exists. Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+# Macro to add for using GNU gettext.
+# Ulrich Drepper <drepper cygnus com>, 1995, 1996
#
-# 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])
-
-# _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`],
- [pkg_failed=yes])
- else
- pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
+# Modified to never use included libintl.
+# Owen Taylor <otaylor redhat com>, 12/15/1998
#
+# Major rework to remove unused code
+# Owen Taylor <otaylor redhat com>, 12/11/2002
#
-# 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
+# Added better handling of ALL_LINGUAS from GNU gettext version
+# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
#
+# Modified to require ngettext
+# Matthias Clasen <mclasen redhat com> 08/06/2004
#
-# --------------------------------------------------------------
-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
+# 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)
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
+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
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+# 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 <locale.h>], [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 <locale.h> file defines LC_MESSAGES.])
+ fi
+ fi])
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
+# 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
+ AC_MSG_RESULT(no)
+fi
+AC_SUBST($1)dnl
+])
-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 "$2" 2>&1`
- else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+# GLIB_WITH_NLS
+#-----------------
+glib_DEFUN([GLIB_WITH_NLS],
+ dnl NLS is obligatory
+ [USE_NLS=yes
+ AC_SUBST(USE_NLS)
- m4_default([$4], [AC_MSG_ERROR(
-[Package requirements ($2) were not met:
+ gt_cv_have_gettext=no
-$$1_PKG_ERRORS
+ CATOBJEXT=NONE
+ XGETTEXT=:
+ INTLLIBS=
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
+ AC_CHECK_HEADER(libintl.h,
+ [gt_cv_func_dgettext_libintl="no"
+ libintl_extra_libs=""
-_PKG_TEXT])[]dnl
+ #
+ # First check in libc
+ #
+ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
+ [AC_TRY_LINK([
+#include <libintl.h>
+],
+ [return !ngettext ("","", 1)],
+ gt_cv_func_ngettext_libc=yes,
+ gt_cv_func_ngettext_libc=no)
])
-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
+
+ 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 <libintl.h>
+],
+ [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
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
- ])
-else
- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
- AC_MSG_RESULT([yes])
- $3
-fi[]dnl
-])# PKG_CHECK_MODULES
+ #
+ # 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)])])
-# 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.
+ 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
-# 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
-])
+ #
+ # 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"
-# _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], [])
+ 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
-# 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]))])
+ 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 <foo bar xx>\n"
+"Language-Team: C <LL li org>\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
+ ])
-# AM_AUX_DIR_EXPAND -*- Autoconf -*-
+ if test "$gt_cv_have_gettext" = "yes" ; then
+ AC_DEFINE(ENABLE_NLS, 1,
+ [always defined to indicate that i18n is enabled])
+ fi
-# 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.
+ 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
-# 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.
+ # We need to process the po/ directory.
+ POSUB=po
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
+ AC_OUTPUT_COMMANDS(
+ [case "$CONFIG_FILES" in *po/Makefile.in*)
+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+ esac])
-# AM_CONDITIONAL -*- Autoconf -*-
+ 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) 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.
+ 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 9
+# 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_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='#'
+ 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
+
+ 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
+
+ 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)
+
+ 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
+ ])
+
+# 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
- $1_TRUE='#'
- $1_FALSE=
+ localedir=`eval echo "${datadir}/locale"`
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])])
+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])
+])
-# 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.
+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
-# serial 10
+# 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])
-# 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...
+dnl GNOME_COMPILE_WARNINGS
+dnl Turn on many useful compiler warnings
+dnl For now, only works on GCC
+AC_DEFUN([GNOME_COMPILE_WARNINGS],[
+ dnl ******************************
+ dnl More compiler warnings
+ dnl ******************************
-# _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
+ AC_ARG_ENABLE(compile-warnings,
+ AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
+ [Turn on compiler warnings]),,
+ [enable_compile_warnings="m4_default([$1],[yes])"])
-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=])
+ warnCFLAGS=
+ if test "x$GCC" != xyes; then
+ enable_compile_warnings=no
+ fi
-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
+ warning_flags=
+ realsave_CFLAGS="$CFLAGS"
- 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])
+ case "$enable_compile_warnings" in
+ no)
+ warning_flags=
+ ;;
+ minimum)
+ warning_flags="-Wall"
+ ;;
+ yes)
+ warning_flags="-Wall -Wmissing-prototypes"
+ ;;
+ maximum|error)
+ warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
+ CFLAGS="$warning_flags $CFLAGS"
+ for option in -Wno-sign-compare; do
+ SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $option"
+ AC_MSG_CHECKING([whether gcc understands $option])
+ AC_TRY_COMPILE([], [],
+ has_option=yes,
+ has_option=no,)
+ CFLAGS="$SAVE_CFLAGS"
+ AC_MSG_RESULT($has_option)
+ if test $has_option = yes; then
+ warning_flags="$warning_flags $option"
+ fi
+ unset has_option
+ unset SAVE_CFLAGS
+ done
+ unset option
+ if test "$enable_compile_warnings" = "error" ; then
+ warning_flags="$warning_flags -Werror"
+ fi
+ ;;
+ *)
+ AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
+ ;;
+ esac
+ CFLAGS="$realsave_CFLAGS"
+ AC_MSG_CHECKING(what warning flags to pass to the C compiler)
+ AC_MSG_RESULT($warning_flags)
- 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
+ AC_ARG_ENABLE(iso-c,
+ AC_HELP_STRING([--enable-iso-c],
+ [Try to warn if code is not ISO C ]),,
+ [enable_iso_c=no])
- # 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
+ AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
+ complCFLAGS=
+ if test "x$enable_iso_c" != "xno"; then
+ if test "x$GCC" = "xyes"; then
+ case " $CFLAGS " in
+ *[\ \ ]-ansi[\ \ ]*) ;;
+ *) complCFLAGS="$complCFLAGS -ansi" ;;
+ esac
+ case " $CFLAGS " in
+ *[\ \ ]-pedantic[\ \ ]*) ;;
+ *) complCFLAGS="$complCFLAGS -pedantic" ;;
+ esac
+ 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
-])
-
+ AC_MSG_RESULT($complCFLAGS)
-# 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
+ WARN_CFLAGS="$warning_flags $complCFLAGS"
+ AC_SUBST(WARN_CFLAGS)
])
-# Generate code to set up dependency tracking. -*- Autoconf -*-
+dnl For C++, do basically the same thing.
-# 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.
+AC_DEFUN([GNOME_CXX_WARNINGS],[
+ AC_ARG_ENABLE(cxx-warnings,
+ AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
+ [Turn on compiler warnings.]),,
+ [enable_cxx_warnings="m4_default([$1],[minimum])"])
-#serial 5
+ AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
+ warnCXXFLAGS=
+ if test "x$GXX" != xyes; then
+ enable_cxx_warnings=no
+ fi
+ if test "x$enable_cxx_warnings" != "xno"; then
+ if test "x$GXX" = "xyes"; then
+ case " $CXXFLAGS " in
+ *[\ \ ]-Wall[\ \ ]*) ;;
+ *) warnCXXFLAGS="-Wall -Wno-unused" ;;
+ esac
-# _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
+ ## -W is not all that useful. And it cannot be controlled
+ ## with individual -Wno-xxx flags, unlike -Wall
+ if test "x$enable_cxx_warnings" = "xyes"; then
+ warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
+ fi
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
-
+ fi
+ AC_MSG_RESULT($warnCXXFLAGS)
-# 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"])
-])
+ AC_ARG_ENABLE(iso-cxx,
+ AC_HELP_STRING([--enable-iso-cxx],
+ [Try to warn if code is not ISO C++ ]),,
+ [enable_iso_cxx=no])
-# Do all the work for Automake. -*- Autoconf -*-
+ AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
+ complCXXFLAGS=
+ if test "x$enable_iso_cxx" != "xno"; then
+ if test "x$GXX" = "xyes"; then
+ case " $CXXFLAGS " in
+ *[\ \ ]-ansi[\ \ ]*) ;;
+ *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
+ esac
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+ case " $CXXFLAGS " in
+ *[\ \ ]-pedantic[\ \ ]*) ;;
+ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
+ esac
+ fi
+ fi
+ AC_MSG_RESULT($complCXXFLAGS)
-# serial 16
+ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
+ AC_SUBST(WARN_CXXFLAGS)
+])
-# This macro actually does too much. Some checks are only needed if
-# your package does certain things. But this isn't really a big deal.
+dnl GLIB_GSETTINGS
+dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether
+dnl the schema should be compiled
+dnl
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out. PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition. After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
-dnl Autoconf wants to disallow AM_ names. We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
- # is not polluted with repeated "-I."
- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
- # test to see if srcdir already configured
- if test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+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
-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'
+ 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
- CYGPATH_W=echo
+ ifelse([$1],,[:],[$1])
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
+ GSETTINGS_RULES='
+.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+mostlyclean-am: clean-gsettings-schemas
-# 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
-])
+gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
-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])])
+%.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
-# 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.
+.SECONDARY: $(gsettings_SCHEMAS)
-# 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])
+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
-# 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.
+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_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)])
+clean-gsettings-schemas:
+ rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
-# 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.
+ifdef gsettings_ENUM_NAMESPACE
+$(gsettings__enum_file): $(gsettings_ENUM_FILES)
+ $(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail " </@type@>" --ftail "</schemalist>" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@
+endif
+'
+ _GSETTINGS_SUBST(GSETTINGS_RULES)
+])
-# serial 2
+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])])
+]
+)
-# 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])])
+# 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.
-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
-# From Jim Meyering
+dnl Authors:
+dnl Ulrich Drepper <drepper cygnus com>, 1995-2000.
+dnl Bruno Haible <haible clisp cons org>, 2000-2003.
-# 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.
+AC_PREREQ([2.50])
-# serial 5
+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])
+])
-# 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
-]
-)
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
+#
+# Copyright © 2004 Scott James Remnant <scott netsplit com>.
+#
+# 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.
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+# 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])
-# Check to see how 'make' treats includes. -*- Autoconf -*-
+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
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
-# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
#
-# 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.
+# 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])
-# serial 4
+# _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
-# 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
-])
+# _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
-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
#
-# 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.
+#
+# 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
-# serial 6
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
-# 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)])
+_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.])
-# 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 "
+if test $pkg_failed = yes; then
+ AC_MSG_RESULT([no])
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+ else
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+ m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+ ])
+elif test $pkg_failed = untried; then
+ AC_MSG_RESULT([no])
+ m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+ ])
else
- am_missing_run=
- AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
+ $3
+fi[]dnl
+])# PKG_CHECK_MODULES
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 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.
-# 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
+# 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
])
-# Helper functions for option handling. -*- Autoconf -*-
+# _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], [])
-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
+# 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; 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)])])
+# 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.
-# _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])])
+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`
+])
-# Check to make sure that the build environment is sane. -*- Autoconf -*-
+# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
+# 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 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
- rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-alias in your environment])
- fi
+# serial 9
- test "$[2]" = conftest.file
- )
-then
- # Ok.
- :
+# 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
- AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
+ $1_TRUE='#'
+ $1_FALSE=
fi
-AC_MSG_RESULT(yes)])
+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) 2009 Free Software Foundation, Inc.
+# 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 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
-])
+# serial 10
-# 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.
+# 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...
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries. This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
- AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+# _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.
#
-# 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 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
-# serial 2
+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=])
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
+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_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Public sister of _AM_SUBST_NOTMAKE.
-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+ 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])
-# Check how to create a tarball. -*- Autoconf -*-
+ 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
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+ # 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 2
+#serial 5
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
+# _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.
#
-# 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
+# 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.
#
-# 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
-
- # 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 <conftest.tar])
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
- 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
-
-# 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 <drepper cygnus com>, 1995, 1996
-#
-# Modified to never use included libintl.
-# Owen Taylor <otaylor redhat com>, 12/15/1998
-#
-# Major rework to remove unused code
-# Owen Taylor <otaylor redhat com>, 12/11/2002
-#
-# Added better handling of ALL_LINGUAS from GNU gettext version
-# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
-#
-# Modified to require ngettext
-# Matthias Clasen <mclasen redhat com> 08/06/2004
-#
-# 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)
+# 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
-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
+# serial 16
-# 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 <locale.h>], [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 <locale.h> file defines LC_MESSAGES.])
- fi
- fi])
+# 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.
-# 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
- AC_MSG_RESULT(no)
+# 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
-AC_SUBST($1)dnl
-])
-
-# GLIB_WITH_NLS
-#-----------------
-glib_DEFUN([GLIB_WITH_NLS],
- dnl NLS is obligatory
- [USE_NLS=yes
- AC_SUBST(USE_NLS)
- gt_cv_have_gettext=no
+# 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])
- CATOBJEXT=NONE
- XGETTEXT=:
- INTLLIBS=
+# 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
- AC_CHECK_HEADER(libintl.h,
- [gt_cv_func_dgettext_libintl="no"
- libintl_extra_libs=""
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
- #
- # First check in libc
- #
- AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
- [AC_TRY_LINK([
-#include <libintl.h>
-],
- [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 <libintl.h>
-],
- [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
+# 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
+])
- #
- # 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 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])])
- 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
- #
- # 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"
+# 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.
- 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
+# 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])
- 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 <foo bar xx>\n"
-"Language-Team: C <LL li org>\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
- ])
+# 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.
- if test "$gt_cv_have_gettext" = "yes" ; then
- AC_DEFINE(ENABLE_NLS, 1,
- [always defined to indicate that i18n is enabled])
- fi
+# 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)])
- 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
+# 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.
- # We need to process the po/ directory.
- POSUB=po
+# serial 2
- AC_OUTPUT_COMMANDS(
- [case "$CONFIG_FILES" in *po/Makefile.in*)
- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
- esac])
+# 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])])
- 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
+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
+# From Jim Meyering
- 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)
- ])
+# 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.
-# 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
+# serial 5
- 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_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
+]
+)
- 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
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
- 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)
+# Check to see how 'make' treats includes. -*- Autoconf -*-
- 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
- ])
+# 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.
-# 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"`
+# 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
-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_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
])
-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
+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# 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])
+# 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)])
-dnl GNOME_COMPILE_WARNINGS
-dnl Turn on many useful compiler warnings
-dnl For now, only works on GCC
-AC_DEFUN([GNOME_COMPILE_WARNINGS],[
- dnl ******************************
- dnl More compiler warnings
- dnl ******************************
+# 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
+])
- AC_ARG_ENABLE(compile-warnings,
- AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
- [Turn on compiler warnings]),,
- [enable_compile_warnings="m4_default([$1],[yes])"])
+# 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.
- warnCFLAGS=
- if test "x$GCC" != xyes; then
- enable_compile_warnings=no
- fi
+# 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
+])
- warning_flags=
- realsave_CFLAGS="$CFLAGS"
+# Helper functions for option handling. -*- Autoconf -*-
- case "$enable_compile_warnings" in
- no)
- warning_flags=
- ;;
- minimum)
- warning_flags="-Wall"
- ;;
- yes)
- warning_flags="-Wall -Wmissing-prototypes"
- ;;
- maximum|error)
- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
- CFLAGS="$warning_flags $CFLAGS"
- for option in -Wno-sign-compare; do
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $option"
- AC_MSG_CHECKING([whether gcc understands $option])
- AC_TRY_COMPILE([], [],
- has_option=yes,
- has_option=no,)
- CFLAGS="$SAVE_CFLAGS"
- AC_MSG_RESULT($has_option)
- if test $has_option = yes; then
- warning_flags="$warning_flags $option"
- fi
- unset has_option
- unset SAVE_CFLAGS
- done
- unset option
- if test "$enable_compile_warnings" = "error" ; then
- warning_flags="$warning_flags -Werror"
- fi
- ;;
- *)
- AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
- ;;
- esac
- CFLAGS="$realsave_CFLAGS"
- AC_MSG_CHECKING(what warning flags to pass to the C compiler)
- AC_MSG_RESULT($warning_flags)
+# 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.
- AC_ARG_ENABLE(iso-c,
- AC_HELP_STRING([--enable-iso-c],
- [Try to warn if code is not ISO C ]),,
- [enable_iso_c=no])
+# serial 4
- AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
- complCFLAGS=
- if test "x$enable_iso_c" != "xno"; then
- if test "x$GCC" = "xyes"; then
- case " $CFLAGS " in
- *[\ \ ]-ansi[\ \ ]*) ;;
- *) complCFLAGS="$complCFLAGS -ansi" ;;
- esac
- case " $CFLAGS " in
- *[\ \ ]-pedantic[\ \ ]*) ;;
- *) complCFLAGS="$complCFLAGS -pedantic" ;;
- esac
- fi
- fi
- AC_MSG_RESULT($complCFLAGS)
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
- WARN_CFLAGS="$warning_flags $complCFLAGS"
- AC_SUBST(WARN_CFLAGS)
-])
+# _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)])
-dnl For C++, do basically the same thing.
+# _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)])])
-AC_DEFUN([GNOME_CXX_WARNINGS],[
- AC_ARG_ENABLE(cxx-warnings,
- AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
- [Turn on compiler warnings.]),,
- [enable_cxx_warnings="m4_default([$1],[minimum])"])
+# _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])])
- AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
- warnCXXFLAGS=
- if test "x$GXX" != xyes; then
- enable_cxx_warnings=no
- fi
- if test "x$enable_cxx_warnings" != "xno"; then
- if test "x$GXX" = "xyes"; then
- case " $CXXFLAGS " in
- *[\ \ ]-Wall[\ \ ]*) ;;
- *) warnCXXFLAGS="-Wall -Wno-unused" ;;
- esac
+# Check to make sure that the build environment is sane. -*- Autoconf -*-
- ## -W is not all that useful. And it cannot be controlled
- ## with individual -Wno-xxx flags, unlike -Wall
- if test "x$enable_cxx_warnings" = "xyes"; then
- warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
- fi
- fi
- fi
- AC_MSG_RESULT($warnCXXFLAGS)
+# 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.
- AC_ARG_ENABLE(iso-cxx,
- AC_HELP_STRING([--enable-iso-cxx],
- [Try to warn if code is not ISO C++ ]),,
- [enable_iso_cxx=no])
+# serial 5
- AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
- complCXXFLAGS=
- if test "x$enable_iso_cxx" != "xno"; then
- if test "x$GXX" = "xyes"; then
- case " $CXXFLAGS " in
- *[\ \ ]-ansi[\ \ ]*) ;;
- *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
- esac
+# 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
- case " $CXXFLAGS " in
- *[\ \ ]-pedantic[\ \ ]*) ;;
- *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
- esac
- 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
- AC_MSG_RESULT($complCXXFLAGS)
+ rm -f conftest.file
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
- WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
- AC_SUBST(WARN_CXXFLAGS)
-])
+ # 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
-dnl GLIB_GSETTINGS
-dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether
-dnl the schema should be compiled
-dnl
+ 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)])
-AC_DEFUN([GLIB_GSETTINGS],
-[
- m4_pattern_allow([AM_V_GEN])
- AC_ARG_ENABLE(schemas-compile,
- AC_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
+# 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.
- GSETTINGS_RULES='
-.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas
+# serial 1
-mostlyclean-am: clean-gsettings-schemas
+# 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
+])
-gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
+# 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.
-%.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_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])])
-all-am: $(gsettings_SCHEMAS:.xml=.valid)
-uninstall-am: uninstall-gsettings-schemas
-install-data-am: install-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.
-.SECONDARY: $(gsettings_SCHEMAS)
+# serial 2
-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
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
-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_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-clean-gsettings-schemas:
- rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+# Check how to create a tarball. -*- Autoconf -*-
-ifdef gsettings_ENUM_NAMESPACE
-$(gsettings__enum_file): $(gsettings_ENUM_FILES)
- $(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail " </@type@>" --ftail "</schemalist>" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@
-endif
-'
- _GSETTINGS_SUBST(GSETTINGS_RULES)
-])
+# 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 _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])])
-]
-)
+# serial 2
-# 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.
+# _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 Authors:
-dnl Ulrich Drepper <drepper cygnus com>, 1995-2000.
-dnl Bruno Haible <haible clisp cons org>, 2000-2003.
+ # 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
-AC_PREREQ([2.50])
+ # 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 <conftest.tar])
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+ fi
+done
+rm -rf conftest.dir
-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])
-])
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
m4_include([m4/gnome-doc-utils.m4])
m4_include([m4/intltool.m4])
diff -pruN 3.0.0-2/config.guess 3.0.1-0ubuntu1/config.guess
--- 3.0.0-2/config.guess 2011-04-04 08:31:34.000000000 +0000
+++ 3.0.1-0ubuntu1/config.guess 2012-01-03 09:26:47.000000000 +0000
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-# Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+# 2011 Free Software Foundation, Inc.
-timestamp='2009-12-30'
+timestamp='2011-05-11'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -57,7 +57,7 @@ GNU config.guess ($timestamp)
Originally written by Per Bothner.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -181,7 +181,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
fi
;;
*)
- os=netbsd
+ os=netbsd
;;
esac
# The OS release
@@ -224,7 +224,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
;;
*5.*)
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
;;
esac
# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -270,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit ;;
+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+ exitcode=$?
+ trap '' 0
+ exit $exitcode ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
@@ -296,7 +299,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
echo s390-ibm-zvmoe
exit ;;
*:OS400:*:*)
- echo powerpc-ibm-os400
+ echo powerpc-ibm-os400
exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
@@ -395,23 +398,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
# MiNT. But MiNT is downward compatible to TOS, so this should
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint${UNAME_RELEASE}
exit ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
+ exit ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint${UNAME_RELEASE}
exit ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
- exit ;;
+ echo m68k-milan-mint${UNAME_RELEASE}
+ exit ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
- exit ;;
+ echo m68k-hades-mint${UNAME_RELEASE}
+ exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
- exit ;;
+ echo m68k-unknown-mint${UNAME_RELEASE}
+ exit ;;
m68k:machten:*:*)
echo m68k-apple-machten${UNAME_RELEASE}
exit ;;
@@ -481,8 +484,8 @@ EOF
echo m88k-motorola-sysv3
exit ;;
AViiON:dgux:*:*)
- # DG/UX returns AViiON for all architectures
- UNAME_PROCESSOR=`/usr/bin/uname -p`
+ # DG/UX returns AViiON for all architectures
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
then
if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -495,7 +498,7 @@ EOF
else
echo i586-dg-dgux${UNAME_RELEASE}
fi
- exit ;;
+ exit ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
exit ;;
@@ -552,7 +555,7 @@ EOF
echo rs6000-ibm-aix3.2
fi
exit ;;
- *:AIX:*:[456])
+ *:AIX:*:[4567])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
@@ -595,52 +598,52 @@ EOF
9000/[678][0-9][0-9])
if [ -x /usr/bin/getconf ]; then
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
- case "${sc_cpu_version}" in
- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
- 532) # CPU_PA_RISC2_0
- case "${sc_kernel_bits}" in
- 32) HP_ARCH="hppa2.0n" ;;
- 64) HP_ARCH="hppa2.0w" ;;
+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+ case "${sc_cpu_version}" in
+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+ 532) # CPU_PA_RISC2_0
+ case "${sc_kernel_bits}" in
+ 32) HP_ARCH="hppa2.0n" ;;
+ 64) HP_ARCH="hppa2.0w" ;;
'') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
- esac ;;
- esac
+ esac ;;
+ esac
fi
if [ "${HP_ARCH}" = "" ]; then
eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ sed 's/^ //' << EOF >$dummy.c
+
+ #define _HPUX_SOURCE
+ #include <stdlib.h>
+ #include <unistd.h>
- #define _HPUX_SOURCE
- #include <stdlib.h>
- #include <unistd.h>
-
- int main ()
- {
- #if defined(_SC_KERNEL_BITS)
- long bits = sysconf(_SC_KERNEL_BITS);
- #endif
- long cpu = sysconf (_SC_CPU_VERSION);
-
- switch (cpu)
- {
- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
- case CPU_PA_RISC2_0:
- #if defined(_SC_KERNEL_BITS)
- switch (bits)
- {
- case 64: puts ("hppa2.0w"); break;
- case 32: puts ("hppa2.0n"); break;
- default: puts ("hppa2.0"); break;
- } break;
- #else /* !defined(_SC_KERNEL_BITS) */
- puts ("hppa2.0"); break;
- #endif
- default: puts ("hppa1.0"); break;
- }
- exit (0);
- }
+ int main ()
+ {
+ #if defined(_SC_KERNEL_BITS)
+ long bits = sysconf(_SC_KERNEL_BITS);
+ #endif
+ long cpu = sysconf (_SC_CPU_VERSION);
+
+ switch (cpu)
+ {
+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+ case CPU_PA_RISC2_0:
+ #if defined(_SC_KERNEL_BITS)
+ switch (bits)
+ {
+ case 64: puts ("hppa2.0w"); break;
+ case 32: puts ("hppa2.0n"); break;
+ default: puts ("hppa2.0"); break;
+ } break;
+ #else /* !defined(_SC_KERNEL_BITS) */
+ puts ("hppa2.0"); break;
+ #endif
+ default: puts ("hppa1.0"); break;
+ }
+ exit (0);
+ }
EOF
(CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -731,22 +734,22 @@ EOF
exit ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd
- exit ;;
+ exit ;;
C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
- exit ;;
+ exit ;;
C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
echo c34-convex-bsd
- exit ;;
+ exit ;;
C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
echo c38-convex-bsd
- exit ;;
+ exit ;;
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
echo c4-convex-bsd
- exit ;;
+ exit ;;
CRAY*Y-MP:*:*:*)
echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit ;;
@@ -770,14 +773,14 @@ EOF
exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit ;;
5000:UNIX_System_V:4.*:*)
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -805,14 +808,14 @@ EOF
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
- # uname -m includes "-pc" on this system.
- echo ${UNAME_MACHINE}-mingw32
+ # uname -m includes "-pc" on this system.
+ echo ${UNAME_MACHINE}-mingw32
exit ;;
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
*:Interix*:*)
- case ${UNAME_MACHINE} in
+ case ${UNAME_MACHINE} in
x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
@@ -867,7 +870,7 @@ EOF
EV6) UNAME_MACHINE=alphaev6 ;;
EV67) UNAME_MACHINE=alphaev67 ;;
EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
+ esac
objdump --private-headers /bin/sh | grep -q ld.so.1
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@@ -879,7 +882,13 @@ EOF
then
echo ${UNAME_MACHINE}-unknown-linux-gnu
else
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_PCS_VFP
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ else
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+ fi
fi
exit ;;
avr32*:Linux:*:*)
@@ -892,7 +901,7 @@ EOF
echo crisv32-axis-linux-gnu
exit ;;
frv:Linux:*:*)
- echo frv-unknown-linux-gnu
+ echo frv-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
LIBC=gnu
@@ -960,7 +969,7 @@ EOF
echo ${UNAME_MACHINE}-ibm-linux
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -968,6 +977,9 @@ EOF
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
+ tile*:Linux:*:*)
+ echo ${UNAME_MACHINE}-tilera-linux-gnu
+ exit ;;
vax:Linux:*:*)
echo ${UNAME_MACHINE}-dec-linux-gnu
exit ;;
@@ -975,7 +987,7 @@ EOF
echo x86_64-unknown-linux-gnu
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -984,11 +996,11 @@ EOF
echo i386-sequent-sysv4
exit ;;
i*86:UNIX_SV:4.2MP:2.*)
- # Unixware is an offshoot of SVR4, but it has its own version
- # number series starting with 2...
- # I am not positive that other SVR4 systems won't match this,
+ # Unixware is an offshoot of SVR4, but it has its own version
+ # number series starting with 2...
+ # I am not positive that other SVR4 systems won't match this,
# I just have to hope. -- rms.
- # Use sysv4.2uw... so that sysv4* matches it.
+ # Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit ;;
i*86:OS/2:*:*)
@@ -1020,7 +1032,7 @@ EOF
fi
exit ;;
i*86:*:5:[678]*)
- # UnixWare 7.x, OpenUNIX and OpenServer 6.
+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
case `/bin/uname -X | grep "^Machine"` in
*486*) UNAME_MACHINE=i486 ;;
*Pentium) UNAME_MACHINE=i586 ;;
@@ -1048,13 +1060,13 @@ EOF
exit ;;
pc:*:*:*)
# Left here for compatibility:
- # uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i586.
+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
+ # the processor, so we play safe by assuming i586.
# Note: whatever this is, it MUST be the same as what config.sub
# prints for the "djgpp" host, or else GDB configury will decide that
# this is a cross-build.
echo i586-pc-msdosdjgpp
- exit ;;
+ exit ;;
Intel:Mach:3*:*)
echo i386-pc-mach3
exit ;;
@@ -1089,8 +1101,8 @@ EOF
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4; exit; } ;;
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && { echo i486-ncr-sysv4; exit; } ;;
NCR*:*:4.2:* | MPRAS*:*:4.2:*)
OS_REL='.3'
test -r /etc/.relid \
@@ -1133,10 +1145,10 @@ EOF
echo ns32k-sni-sysv
fi
exit ;;
- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
- # says <Richard M Bartel ccMail Census GOV>
- echo i586-unisys-sysv4
- exit ;;
+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+ # says <Richard M Bartel ccMail Census GOV>
+ echo i586-unisys-sysv4
+ exit ;;
*:UNIX_System_V:4*:FTX*)
# From Gerald Hewes <hewes openmarket com>.
# How about differentiating between stratus architectures? -djm
@@ -1162,11 +1174,11 @@ EOF
exit ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
- echo mips-nec-sysv${UNAME_RELEASE}
+ echo mips-nec-sysv${UNAME_RELEASE}
else
- echo mips-unknown-sysv${UNAME_RELEASE}
+ echo mips-unknown-sysv${UNAME_RELEASE}
fi
- exit ;;
+ exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
echo powerpc-be-beos
exit ;;
@@ -1231,6 +1243,9 @@ EOF
*:QNX:*:4*)
echo i386-pc-qnx
exit ;;
+ NEO-?:NONSTOP_KERNEL:*:*)
+ echo neo-tandem-nsk${UNAME_RELEASE}
+ exit ;;
NSE-?:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
exit ;;
@@ -1276,13 +1291,13 @@ EOF
echo pdp10-unknown-its
exit ;;
SEI:*:*:SEIUX)
- echo mips-sei-seiux${UNAME_RELEASE}
+ echo mips-sei-seiux${UNAME_RELEASE}
exit ;;
*:DragonFly:*:*)
echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit ;;
*:*VMS:*:*)
- UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
case "${UNAME_MACHINE}" in
A*) echo alpha-dec-vms ; exit ;;
I*) echo ia64-dec-vms ; exit ;;
@@ -1322,11 +1337,11 @@ main ()
#include <sys/param.h>
printf ("m68k-sony-newsos%s\n",
#ifdef NEWSOS4
- "4"
+ "4"
#else
- ""
+ ""
#endif
- ); exit (0);
+ ); exit (0);
#endif
#endif
diff -pruN 3.0.0-2/config.sub 3.0.1-0ubuntu1/config.sub
--- 3.0.0-2/config.sub 2011-04-04 08:31:34.000000000 +0000
+++ 3.0.1-0ubuntu1/config.sub 2012-01-03 09:26:47.000000000 +0000
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-# Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+# 2011 Free Software Foundation, Inc.
-timestamp='2010-01-22'
+timestamp='2011-03-23'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -76,7 +76,7 @@ version="\
GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -124,8 +124,9 @@ esac
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+ knetbsd*-gnu* | netbsd*-gnu* | \
kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
@@ -157,8 +158,8 @@ case $os in
os=
basic_machine=$1
;;
- -bluegene*)
- os=-cnk
+ -bluegene*)
+ os=-cnk
;;
-sim | -cisco | -oki | -wec | -winbond)
os=
@@ -174,10 +175,10 @@ case $os in
os=-chorusos
basic_machine=$1
;;
- -chorusrdb)
- os=-chorusrdb
+ -chorusrdb)
+ os=-chorusrdb
basic_machine=$1
- ;;
+ ;;
-hiux*)
os=-hiuxwe2
;;
@@ -282,11 +283,13 @@ case $basic_machine in
| moxie \
| mt \
| msp430 \
+ | nds32 | nds32le | nds32be \
| nios | nios2 \
| ns16k | ns32k \
+ | open8 \
| or32 \
| pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
| rx \
| score \
@@ -294,15 +297,24 @@ case $basic_machine in
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
- | spu | strongarm \
- | tahoe | thumb | tic4x | tic80 | tron \
+ | spu \
+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \
| v850 | v850e \
| we32k \
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
basic_machine=$basic_machine-unknown
;;
+ c54x)
+ basic_machine=tic54x-unknown
+ ;;
+ c55x)
+ basic_machine=tic55x-unknown
+ ;;
+ c6x)
+ basic_machine=tic6x-unknown
+ ;;
m6811 | m68hc11 | m6812 | m68hc12 | picochip)
# Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
@@ -314,6 +326,18 @@ case $basic_machine in
basic_machine=mt-unknown
;;
+ strongarm | thumb | xscale)
+ basic_machine=arm-unknown
+ ;;
+
+ xscaleeb)
+ basic_machine=armeb-unknown
+ ;;
+
+ xscaleel)
+ basic_machine=armel-unknown
+ ;;
+
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
@@ -334,7 +358,7 @@ case $basic_machine in
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
| bfin-* | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* \
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
@@ -368,26 +392,28 @@ case $basic_machine in
| mmix-* \
| mt-* \
| msp430-* \
+ | nds32-* | nds32le-* | nds32be-* \
| nios-* | nios2-* \
| none-* | np1-* | ns16k-* | ns32k-* \
+ | open8-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \
| romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
- | tahoe-* | thumb-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+ | tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tile-* | tilegx-* \
| tron-* \
| ubicom32-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
| ymp-* \
| z8k-* | z80-*)
@@ -412,7 +438,7 @@ case $basic_machine in
basic_machine=a29k-amd
os=-udi
;;
- abacus)
+ abacus)
basic_machine=abacus-unknown
;;
adobe68k)
@@ -482,11 +508,20 @@ case $basic_machine in
basic_machine=powerpc-ibm
os=-cnk
;;
+ c54x-*)
+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ c55x-*)
+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ c6x-*)
+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
c90)
basic_machine=c90-cray
os=-unicos
;;
- cegcc)
+ cegcc)
basic_machine=arm-unknown
os=-cegcc
;;
@@ -518,7 +553,7 @@ case $basic_machine in
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16)
+ cr16 | cr16-*)
basic_machine=cr16-unknown
os=-elf
;;
@@ -734,7 +769,7 @@ case $basic_machine in
basic_machine=ns32k-utek
os=-sysv
;;
- microblaze)
+ microblaze)
basic_machine=microblaze-xilinx
;;
mingw32)
@@ -841,6 +876,12 @@ case $basic_machine in
np1)
basic_machine=np1-gould
;;
+ neo-tandem)
+ basic_machine=neo-tandem
+ ;;
+ nse-tandem)
+ basic_machine=nse-tandem
+ ;;
nsr-tandem)
basic_machine=nsr-tandem
;;
@@ -923,9 +964,10 @@ case $basic_machine in
;;
power) basic_machine=power-ibm
;;
- ppc) basic_machine=powerpc-unknown
+ ppc | ppcbe) basic_machine=powerpc-unknown
;;
- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ppc-* | ppcbe-*)
+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppcle | powerpclittle | ppc-le | powerpc-little)
basic_machine=powerpcle-unknown
@@ -1019,6 +1061,9 @@ case $basic_machine in
basic_machine=i860-stratus
os=-sysv4
;;
+ strongarm-* | thumb-*)
+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
sun2)
basic_machine=m68000-sun
;;
@@ -1075,20 +1120,8 @@ case $basic_machine in
basic_machine=t90-cray
os=-unicos
;;
- tic54x | c54x*)
- basic_machine=tic54x-unknown
- os=-coff
- ;;
- tic55x | c55x*)
- basic_machine=tic55x-unknown
- os=-coff
- ;;
- tic6x | c6x*)
- basic_machine=tic6x-unknown
- os=-coff
- ;;
- # This must be matched before tile*.
- tilegx*)
+ # This must be matched before tile*.
+ tilegx*)
basic_machine=tilegx-unknown
os=-linux-gnu
;;
@@ -1163,6 +1196,9 @@ case $basic_machine in
xps | xps100)
basic_machine=xps100-honeywell
;;
+ xscale-* | xscalee[bl]-*)
+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+ ;;
ymp)
basic_machine=ymp-cray
os=-unicos
@@ -1260,11 +1296,11 @@ esac
if [ x"$os" != x"" ]
then
case $os in
- # First match some system type aliases
- # that might get confused with valid system types.
+ # First match some system type aliases
+ # that might get confused with valid system types.
# -solaris* is a basic system type, with this one exception.
- -auroraux)
- os=-auroraux
+ -auroraux)
+ os=-auroraux
;;
-solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1301,7 +1337,8 @@ case $os in
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+ | -mingw32* | -linux-gnu* | -linux-android* \
+ | -linux-newlib* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1348,7 +1385,7 @@ case $os in
-opened*)
os=-openedition
;;
- -os400*)
+ -os400*)
os=-os400
;;
-wince*)
@@ -1397,7 +1434,7 @@ case $os in
-sinix*)
os=-sysv4
;;
- -tpf*)
+ -tpf*)
os=-tpf
;;
-triton*)
@@ -1442,8 +1479,8 @@ case $os in
-dicos*)
os=-dicos
;;
- -nacl*)
- ;;
+ -nacl*)
+ ;;
-none)
;;
*)
@@ -1466,10 +1503,10 @@ else
# system, and we'll never get to this point.
case $basic_machine in
- score-*)
+ score-*)
os=-elf
;;
- spu-*)
+ spu-*)
os=-elf
;;
*-acorn)
@@ -1481,8 +1518,17 @@ case $basic_machine in
arm*-semi)
os=-aout
;;
- c4x-* | tic4x-*)
- os=-coff
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
+ tic54x-*)
+ os=-coff
+ ;;
+ tic55x-*)
+ os=-coff
+ ;;
+ tic6x-*)
+ os=-coff
;;
# This must come before the *-dec entry.
pdp10-*)
@@ -1509,7 +1555,7 @@ case $basic_machine in
m68*-cisco)
os=-aout
;;
- mep-*)
+ mep-*)
os=-elf
;;
mips*-cisco)
@@ -1536,7 +1582,7 @@ case $basic_machine in
*-ibm)
os=-aix
;;
- *-knuth)
+ *-knuth)
os=-mmixware
;;
*-wec)
diff -pruN 3.0.0-2/configure 3.0.1-0ubuntu1/configure
--- 3.0.0-2/configure 2011-04-04 08:31:33.000000000 +0000
+++ 3.0.1-0ubuntu1/configure 2012-01-03 09:26:46.000000000 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for GNOME Nettool 3.0.0.
+# Generated by GNU Autoconf 2.68 for GNOME Nettool 3.0.1.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-nettool>.
#
@@ -91,6 +91,7 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
+as_myself=
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -173,6 +174,14 @@ test x\$exitcode = x0 || exit 1"
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+
+ test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+ PATH=/empty FPATH=/empty; export PATH FPATH
+ test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+ || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
test \$(( 1 + 1 )) = 2 || exit 1"
if (eval "$as_required") 2>/dev/null; then :
as_have_required=yes
@@ -216,11 +225,18 @@ IFS=$as_save_IFS
# We cannot yet assume a decent shell, so we have to provide a
# neutralization value for shells without unset; and this also
# works around shells that cannot unset nonexistent variables.
+ # Preserve -v and -x to the replacement shell.
BASH_ENV=/dev/null
ENV=/dev/null
(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+ esac
+ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
fi
if test x$as_have_required = xno; then :
@@ -529,155 +545,8 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
# Sed expression to map a string onto a valid variable name.
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
-case X$lt_ECHO in
-X*--fallback-echo)
- # Remove one level of quotation (which was required for Make).
- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
- ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X$1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
-elif test "X$1" = X--fallback-echo; then
- # Avoid inline document here, it may be left over
- :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
- # Yippee, $ECHO works!
- :
-else
- # Restart under the correct shell.
- exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
- # used as fallback echo
- shift
- cat <<_LT_EOF
-$*
-_LT_EOF
- exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
- if test "X${echo_test_string+set}" != Xset; then
- # find a string as large as possible, as long as the shell can cope with it
- for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
- if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
- then
- break
- fi
- done
- fi
-
- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- :
- else
- # The Solaris, AIX, and Digital Unix default echo programs unquote
- # backslashes. This makes it impossible to quote backslashes using
- # echo "$something" | sed 's/\\/\\\\/g'
- #
- # So, first we look for a working echo in the user's PATH.
-
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for dir in $PATH /usr/ucb; do
- IFS="$lt_save_ifs"
- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- ECHO="$dir/echo"
- break
- fi
- done
- IFS="$lt_save_ifs"
-
- if test "X$ECHO" = Xecho; then
- # We didn't find a better echo, so look for alternatives.
- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # This shell has a builtin print -r that does the trick.
- ECHO='print -r'
- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
- test "X$CONFIG_SHELL" != X/bin/ksh; then
- # If we have ksh, try running configure again with it.
- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
- export ORIGINAL_CONFIG_SHELL
- CONFIG_SHELL=/bin/ksh
- export CONFIG_SHELL
- exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
- else
- # Try using printf.
- ECHO='printf %s\n'
- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # Cool, printf works
- :
- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
- export CONFIG_SHELL
- SHELL="$CONFIG_SHELL"
- export SHELL
- ECHO="$CONFIG_SHELL $0 --fallback-echo"
- elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- ECHO="$CONFIG_SHELL $0 --fallback-echo"
- else
- # maybe with a smaller string...
- prev=:
-
- for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
- then
- break
- fi
- prev="$cmd"
- done
-
- if test "$prev" != 'sed 50q "$0"'; then
- echo_test_string=`eval $prev`
- export echo_test_string
- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
- else
- # Oops. We lost completely, so just stick with echo.
- ECHO=echo
- fi
- fi
- fi
- fi
- fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
- lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-fi
-
-
-
test -n "$DJDIR" || exec 7<&0 </dev/null
exec 6>&1
@@ -702,8 +571,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='GNOME Nettool'
PACKAGE_TARNAME='gnome-nettool'
-PACKAGE_VERSION='3.0.0'
-PACKAGE_STRING='GNOME Nettool 3.0.0'
+PACKAGE_VERSION='3.0.1'
+PACKAGE_STRING='GNOME Nettool 3.0.1'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-nettool'
PACKAGE_URL='http://projects.gnome.org/gnome-network/'
@@ -814,9 +683,11 @@ OTOOL
LIPO
NMEDIT
DSYMUTIL
-lt_ECHO
+MANIFEST_TOOL
RANLIB
+ac_ct_AR
AR
+DLLTOOL
OBJDUMP
LN_S
NM
@@ -929,6 +800,7 @@ enable_static
with_pic
enable_fast_install
with_gnu_ld
+with_sysroot
enable_libtool_lock
enable_nls
with_help_dir
@@ -1358,7 +1230,7 @@ Try \`$0 --help' for more information"
$as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
$as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
;;
esac
@@ -1496,7 +1368,7 @@ if test "$ac_init_help" = "long"; then
# 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 GNOME Nettool 3.0.0 to adapt to many kinds of systems.
+\`configure' configures GNOME Nettool 3.0.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1566,7 +1438,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GNOME Nettool 3.0.0:";;
+ short | recursive ) echo "Configuration of GNOME Nettool 3.0.1:";;
esac
cat <<\_ACEOF
@@ -1600,6 +1472,8 @@ Optional Packages:
--with-pic try to use only PIC/non-PIC objects [default=use
both]
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
+ --with-sysroot=DIR Search for dependent libraries within DIR
+ (or the compiler's sysroot if not specified).
--with-help-dir=DIR path to help docs
--with-omf-dir=DIR path to OMF files
--with-help-formats=FORMATS
@@ -1691,8 +1565,8 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-GNOME Nettool configure 3.0.0
-generated by GNU Autoconf 2.67
+GNOME Nettool configure 3.0.1
+generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
@@ -1738,7 +1612,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
} # ac_fn_c_try_compile
@@ -1784,7 +1658,7 @@ fi
# interfere with the next link command; also delete a directory that is
# left behind by Apple's compiler. We do this before executing the actions.
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
} # ac_fn_c_try_link
@@ -1798,7 +1672,7 @@ ac_fn_c_check_header_compile ()
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1816,7 +1690,7 @@ fi
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_header_compile
@@ -1852,7 +1726,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
} # ac_fn_c_try_cpp
@@ -1894,7 +1768,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=$ac_status
fi
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
} # ac_fn_c_try_run
@@ -1907,7 +1781,7 @@ ac_fn_c_check_func ()
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1962,7 +1836,7 @@ fi
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_func
@@ -1974,10 +1848,10 @@ $as_echo "$ac_res" >&6; }
ac_fn_c_check_header_mongrel ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if eval "test \"\${$3+set}\"" = set; then :
+ if eval \${$3+:} false; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
fi
eval ac_res=\$$3
@@ -2044,7 +1918,7 @@ $as_echo "$as_me: WARNING: $2: proceedin
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
eval "$3=\$ac_header_compiler"
@@ -2053,15 +1927,15 @@ eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_header_mongrel
cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by GNOME Nettool $as_me 3.0.0, which was
-generated by GNU Autoconf 2.67. Invocation command line was
+It was created by GNOME Nettool $as_me 3.0.1, which was
+generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2319,7 +2193,7 @@ $as_echo "$as_me: loading site script $a
|| { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
fi
done
@@ -2462,7 +2336,7 @@ ac_configure="$SHELL $ac_aux_dir/configu
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
$as_echo_n "checking for a BSD-compatible install... " >&6; }
if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if ${ac_cv_path_install+:} false; then :
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2549,11 +2423,11 @@ am_lf='
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
esac
# Do `set' in a subshell so we don't clobber the current shell's
@@ -2639,7 +2513,7 @@ if test "$cross_compiling" != no; then
set dummy ${ac_tool_prefix}strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
+if ${ac_cv_prog_STRIP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
@@ -2679,7 +2553,7 @@ if test -z "$ac_cv_prog_STRIP"; then
set dummy strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
@@ -2732,7 +2606,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
if test -z "$MKDIR_P"; then
- if test "${ac_cv_path_mkdir+set}" = set; then :
+ if ${ac_cv_path_mkdir+:} false; then :
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2783,7 +2657,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
+if ${ac_cv_prog_AWK+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
@@ -2823,7 +2697,7 @@ done
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -2881,7 +2755,7 @@ fi
# Define the identity of the package.
PACKAGE='gnome-nettool'
- VERSION='3.0.0'
+ VERSION='3.0.1'
cat >>confdefs.h <<_ACEOF
@@ -2971,7 +2845,7 @@ if test -n "$ac_tool_prefix"; then
set dummy ${ac_tool_prefix}gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3011,7 +2885,7 @@ if test -z "$ac_cv_prog_CC"; then
set dummy gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -3064,7 +2938,7 @@ if test -z "$CC"; then
set dummy ${ac_tool_prefix}cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3104,7 +2978,7 @@ if test -z "$CC"; then
set dummy cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3163,7 +3037,7 @@ if test -z "$CC"; then
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3207,7 +3081,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -3262,7 +3136,7 @@ fi
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3377,7 +3251,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -3420,7 +3294,7 @@ else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
fi
rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3479,7 +3353,7 @@ $as_echo "$ac_try_echo"; } >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
fi
fi
fi
@@ -3490,7 +3364,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_ex
ac_clean_files=$ac_clean_files_save
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
$as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
+if ${ac_cv_objext+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3531,7 +3405,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -3541,7 +3415,7 @@ OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3578,7 +3452,7 @@ ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
@@ -3656,7 +3530,7 @@ else
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
@@ -3817,7 +3691,7 @@ depcc="$CC" am_compiler_list=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -3951,8 +3825,8 @@ esac
-macro_version='2.2.6b'
-macro_revision='1.3017'
+macro_version='2.4'
+macro_revision='1.3293'
@@ -3974,7 +3848,7 @@ $SHELL "$ac_aux_dir/config.sub" sun4 >/d
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
$as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
+if ${ac_cv_build+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_build_alias=$build_alias
@@ -3990,7 +3864,7 @@ fi
$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
@@ -4008,7 +3882,7 @@ case $build_os in *\ *) build_os=`echo "
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
$as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
+if ${ac_cv_host+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "x$host_alias" = x; then
@@ -4023,7 +3897,7 @@ fi
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
@@ -4039,9 +3913,78 @@ IFS=$ac_save_IFS
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+$as_echo_n "checking how to print strings... " >&6; }
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+ ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+ ECHO='printf %s\n'
+else
+ # Use this function as a fallback that always works.
+ func_fallback_echo ()
+ {
+ eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+ }
+ ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+ $ECHO ""
+}
+
+case "$ECHO" in
+ printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+$as_echo "printf" >&6; } ;;
+ print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+$as_echo "print -r" >&6; } ;;
+ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+$as_echo "cat" >&6; } ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then :
+if ${ac_cv_path_SED+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
@@ -4123,7 +4066,7 @@ Xsed="$SED -e 1s/^X//"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
+if ${ac_cv_path_GREP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
@@ -4186,7 +4129,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+if ${ac_cv_path_EGREP+:} false; then :
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -4253,7 +4196,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
$as_echo_n "checking for fgrep... " >&6; }
-if test "${ac_cv_path_FGREP+set}" = set; then :
+if ${ac_cv_path_FGREP+:} false; then :
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
@@ -4384,7 +4327,7 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
$as_echo_n "checking for non-GNU ld... " >&6; }
fi
-if test "${lt_cv_path_LD+set}" = set; then :
+if ${lt_cv_path_LD+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
@@ -4424,7 +4367,7 @@ fi
test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then :
+if ${lt_cv_prog_gnu_ld+:} false; then :
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
@@ -4451,7 +4394,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if test "${lt_cv_path_NM+set}" = set; then :
+if ${lt_cv_path_NM+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
@@ -4504,14 +4447,17 @@ if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
else
# Didn't find any BSD compatible name lister, look for dumpbin.
- if test -n "$ac_tool_prefix"; then
- for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+ if test -n "$DUMPBIN"; then :
+ # Let the user override the test.
+ else
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in dumpbin "link -dump"
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
+if ${ac_cv_prog_DUMPBIN+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
@@ -4549,13 +4495,13 @@ fi
fi
if test -z "$DUMPBIN"; then
ac_ct_DUMPBIN=$DUMPBIN
- for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+ for ac_prog in dumpbin "link -dump"
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
@@ -4604,6 +4550,15 @@ esac
fi
fi
+ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+ *COFF*)
+ DUMPBIN="$DUMPBIN -symbols"
+ ;;
+ *)
+ DUMPBIN=:
+ ;;
+ esac
+ fi
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
@@ -4618,18 +4573,18 @@ test -z "$NM" && NM=nm
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if test "${lt_cv_nm_interface+set}" = set; then :
+if ${lt_cv_nm_interface+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4626: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4629: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4632: output\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -4653,7 +4608,7 @@ fi
# find the maximum length of command line arguments
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
+if ${lt_cv_sys_max_cmd_len+:} false; then :
$as_echo_n "(cached) " >&6
else
i=0
@@ -4686,6 +4641,11 @@ else
lt_cv_sys_max_cmd_len=8192;
;;
+ mint*)
+ # On MiNT this can take a long time and run out of memory.
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
@@ -4750,8 +4710,8 @@ else
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
- = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+ = "X$teststring$teststring"; } >/dev/null 2>&1 &&
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
@@ -4793,8 +4753,8 @@ $as_echo_n "checking whether the shell u
# Try some XSI features
xsi_shell=no
( _lt_dummy="a/b/c"
- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
- = c,a/b,, \
+ 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
@@ -4843,9 +4803,83 @@ esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
+if ${lt_cv_to_host_file_cmd+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ 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
+
+fi
+
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
+if ${lt_cv_to_tool_file_cmd+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ #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
+
+fi
+
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
+
+
+
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if test "${lt_cv_ld_reload_flag+set}" = set; then :
+if ${lt_cv_ld_reload_flag+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_ld_reload_flag='-r'
@@ -4859,6 +4893,11 @@ case $reload_flag in
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
+ cygwin* | mingw* | pw32* | cegcc*)
+ if test "$GCC" != yes; then
+ reload_cmds=false
+ fi
+ ;;
darwin*)
if test "$GCC" = yes; then
reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
@@ -4881,7 +4920,7 @@ if test -n "$ac_tool_prefix"; then
set dummy ${ac_tool_prefix}objdump; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
+if ${ac_cv_prog_OBJDUMP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
@@ -4921,7 +4960,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
set dummy objdump; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
@@ -4980,7 +5019,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if test "${lt_cv_deplibs_check_method+set}" = set; then :
+if ${lt_cv_deplibs_check_method+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
@@ -5022,16 +5061,18 @@ mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
- if ( file / ) >/dev/null 2>&1; then
+ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
else
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+ # Keep this pattern in sync with the one in func_win32_libid.
+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
lt_cv_file_magic_cmd='$OBJDUMP -f'
fi
;;
-cegcc)
+cegcc*)
# use the weaker test based on 'objdump'. See mingw*.
lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -5061,6 +5102,10 @@ gnu*)
lt_cv_deplibs_check_method=pass_all
;;
+haiku*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
@@ -5069,11 +5114,11 @@ hpux10.20* | hpux11*)
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
;;
*)
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
@@ -5176,6 +5221,21 @@ esac
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
$as_echo "$lt_cv_deplibs_check_method" >&6; }
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+ case $host_os in
+ mingw* | pw32*)
+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+ want_nocaseglob=yes
+ else
+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
+ fi
+ ;;
+ esac
+fi
+
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -5191,16 +5251,26 @@ test -z "$deplibs_check_method" && depli
+
+
+
+
+
+
+
+
+
+
if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then :
+if ${ac_cv_prog_DLLTOOL+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test -n "$AR"; then
- ac_cv_prog_AR="$AR" # Let the user override the test.
+ if test -n "$DLLTOOL"; then
+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -5209,7 +5279,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AR="${ac_tool_prefix}ar"
+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -5219,10 +5289,10 @@ IFS=$as_save_IFS
fi
fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -5230,17 +5300,17 @@ fi
fi
-if test -z "$ac_cv_prog_AR"; then
- ac_ct_AR=$AR
- # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
+if test -z "$ac_cv_prog_DLLTOOL"; then
+ ac_ct_DLLTOOL=$DLLTOOL
+ # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test -n "$ac_ct_AR"; then
- ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+ if test -n "$ac_ct_DLLTOOL"; then
+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -5249,7 +5319,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_AR="ar"
+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -5259,17 +5329,17 @@ IFS=$as_save_IFS
fi
fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- if test "x$ac_ct_AR" = x; then
- AR="false"
+ if test "x$ac_ct_DLLTOOL" = x; then
+ DLLTOOL="false"
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5277,18 +5347,55 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
- AR=$ac_ct_AR
+ DLLTOOL=$ac_ct_DLLTOOL
fi
else
- AR="$ac_cv_prog_AR"
+ DLLTOOL="$ac_cv_prog_DLLTOOL"
fi
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+ # two different shell functions defined in ltmain.sh
+ # decide which to use based on capabilities of $DLLTOOL
+ case `$DLLTOOL --help 2>&1` in
+ *--identify-strict*)
+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+ ;;
+ *)
+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+ ;;
+ esac
+ ;;
+*)
+ # fallback: assume linklib IS sharedlib
+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+ ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
@@ -5297,15 +5404,17 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
+ for ac_prog in ar
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
+if ${ac_cv_prog_AR+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test -n "$STRIP"; then
- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+ if test -n "$AR"; then
+ ac_cv_prog_AR="$AR" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -5314,7 +5423,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -5324,28 +5433,32 @@ IFS=$as_save_IFS
fi
fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
+ test -n "$AR" && break
+ done
fi
-if test -z "$ac_cv_prog_STRIP"; then
- ac_ct_STRIP=$STRIP
- # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
+if test -z "$AR"; then
+ ac_ct_AR=$AR
+ for ac_prog in ar
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test -n "$ac_ct_STRIP"; then
- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+ if test -n "$ac_ct_AR"; then
+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -5354,7 +5467,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_STRIP="strip"
+ ac_cv_prog_ac_ct_AR="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -5364,17 +5477,21 @@ IFS=$as_save_IFS
fi
fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- if test "x$ac_ct_STRIP" = x; then
- STRIP=":"
+
+ test -n "$ac_ct_AR" && break
+done
+
+ if test "x$ac_ct_AR" = x; then
+ AR="false"
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5382,7 +5499,168 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
- STRIP=$ac_ct_STRIP
+ AR=$ac_ct_AR
+ fi
+fi
+
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+$as_echo_n "checking for archiver @FILE support... " >&6; }
+if ${lt_cv_ar_at_file+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_ar_at_file=no
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ echo conftest.$ac_objext > conftest.lst
+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+ (eval $lt_ar_try) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if test "$ac_status" -eq 0; then
+ # Ensure the archiver fails upon bogus file names.
+ rm -f conftest.$ac_objext libconftest.a
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+ (eval $lt_ar_try) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if test "$ac_status" -ne 0; then
+ lt_cv_ar_at_file=@
+ fi
+ fi
+ rm -f conftest.* libconftest.a
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+$as_echo "$lt_cv_ar_at_file" >&6; }
+
+if test "x$lt_cv_ar_at_file" = xno; then
+ archiver_list_spec=
+else
+ archiver_list_spec=$lt_cv_ar_at_file
+fi
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$STRIP"; then
+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+ ac_ct_STRIP=$STRIP
+ # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_STRIP"; then
+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_STRIP="strip"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_STRIP" = x; then
+ STRIP=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ STRIP=$ac_ct_STRIP
fi
else
STRIP="$ac_cv_prog_STRIP"
@@ -5400,7 +5678,7 @@ if test -n "$ac_tool_prefix"; then
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
+if ${ac_cv_prog_RANLIB+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
@@ -5440,7 +5718,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
set dummy ranlib; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
@@ -5511,6 +5789,18 @@ if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
+case $host_os in
+ darwin*)
+ lock_old_archive_extraction=yes ;;
+ *)
+ lock_old_archive_extraction=no ;;
+esac
+
+
+
+
+
+
@@ -5557,7 +5847,7 @@ compiler=$CC
# Check for command to grab the raw symbol name followed by C symbol from nm.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -5618,8 +5908,8 @@ esac
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
# Handle CRLF in mingw tool chain
opt_cr=
@@ -5655,6 +5945,7 @@ for ac_symprfx in "" "_"; do
else
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
fi
+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
# Check to see that the pipe works correctly.
pipe_works=no
@@ -5680,8 +5971,8 @@ _LT_EOF
test $ac_status = 0; }; then
# Now try to grab the symbols.
nlist=conftest.nm
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
- (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
+ (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } && test -s "$nlist"; then
@@ -5696,6 +5987,18 @@ _LT_EOF
if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+ relocations are performed -- see ld's documentation on pseudo-relocs. */
+# define LT_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data. */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -5707,7 +6010,7 @@ _LT_EOF
cat <<_LT_EOF >> conftest.$ac_ext
/* The mapping between symbol names and symbols. */
-const struct {
+LT_DLSYM_CONST struct {
const char *name;
void *address;
}
@@ -5733,8 +6036,8 @@ static const void *lt_preloaded_setup()
_LT_EOF
# Now try linking the two files.
mv conftest.$ac_objext conftstm.$ac_objext
- lt_save_LIBS="$LIBS"
- lt_save_CFLAGS="$CFLAGS"
+ lt_globsym_save_LIBS=$LIBS
+ lt_globsym_save_CFLAGS=$CFLAGS
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
@@ -5744,8 +6047,8 @@ _LT_EOF
test $ac_status = 0; } && test -s conftest${ac_exeext}; then
pipe_works=yes
fi
- LIBS="$lt_save_LIBS"
- CFLAGS="$lt_save_CFLAGS"
+ LIBS=$lt_globsym_save_LIBS
+ CFLAGS=$lt_globsym_save_CFLAGS
else
echo "cannot find nm_test_func in $nlist" >&5
fi
@@ -5782,6 +6085,15 @@ else
$as_echo "ok" >&6; }
fi
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+ nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
+ nm_file_list_spec='@'
+fi
+
+
+
@@ -5804,6 +6116,45 @@ fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+$as_echo_n "checking for sysroot... " >&6; }
+
+# Check whether --with-sysroot was given.
+if test "${with_sysroot+set}" = set; then :
+ withval=$with_sysroot;
+else
+ with_sysroot=no
+fi
+
+
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+ if test "$GCC" = yes; then
+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+ fi
+ ;; #(
+ /*)
+ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+ ;; #(
+ no|'')
+ ;; #(
+ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
+$as_echo "${with_sysroot}" >&6; }
+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
+ ;;
+esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+$as_echo "${lt_sysroot:-no}" >&6; }
+
+
+
+
+
# Check whether --enable-libtool-lock was given.
if test "${enable_libtool_lock+set}" = set; then :
enableval=$enable_libtool_lock;
@@ -5835,7 +6186,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5838 "configure"' > conftest.$ac_ext
+ echo '#line '$LINENO' "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5929,7 +6280,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
CFLAGS="$CFLAGS -belf"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if test "${lt_cv_cc_needs_belf+set}" = set; then :
+if ${lt_cv_cc_needs_belf+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_ext=c
@@ -5997,6 +6348,123 @@ esac
need_locks="$enable_libtool_lock"
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
+set dummy ${ac_tool_prefix}mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$MANIFEST_TOOL"; then
+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
+if test -n "$MANIFEST_TOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+$as_echo "$MANIFEST_TOOL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
+ # Extract the first word of "mt", so it can be a program name with args.
+set dummy mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_MANIFEST_TOOL"; then
+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
+if test -n "$ac_ct_MANIFEST_TOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
+ MANIFEST_TOOL=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
+ fi
+else
+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
+fi
+
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+if ${lt_cv_path_mainfest_tool+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_path_mainfest_tool=no
+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+ cat conftest.err >&5
+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+ lt_cv_path_mainfest_tool=yes
+ fi
+ rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+ MANIFEST_TOOL=:
+fi
+
+
+
+
+
case $host_os in
rhapsody* | darwin*)
@@ -6005,7 +6473,7 @@ need_locks="$enable_libtool_lock"
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
+if ${ac_cv_prog_DSYMUTIL+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
@@ -6045,7 +6513,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
set dummy dsymutil; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
@@ -6097,7 +6565,7 @@ fi
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_NMEDIT+set}" = set; then :
+if ${ac_cv_prog_NMEDIT+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
@@ -6137,7 +6605,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then
set dummy nmedit; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
@@ -6189,7 +6657,7 @@ fi
set dummy ${ac_tool_prefix}lipo; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LIPO+set}" = set; then :
+if ${ac_cv_prog_LIPO+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
@@ -6229,7 +6697,7 @@ if test -z "$ac_cv_prog_LIPO"; then
set dummy lipo; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
@@ -6281,7 +6749,7 @@ fi
set dummy ${ac_tool_prefix}otool; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL+set}" = set; then :
+if ${ac_cv_prog_OTOOL+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
@@ -6321,7 +6789,7 @@ if test -z "$ac_cv_prog_OTOOL"; then
set dummy otool; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
@@ -6373,7 +6841,7 @@ fi
set dummy ${ac_tool_prefix}otool64; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL64+set}" = set; then :
+if ${ac_cv_prog_OTOOL64+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
@@ -6413,7 +6881,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then
set dummy otool64; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
@@ -6488,7 +6956,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
$as_echo_n "checking for -single_module linker flag... " >&6; }
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
+if ${lt_cv_apple_cc_single_mod+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
@@ -6517,7 +6985,7 @@ fi
$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
+if ${lt_cv_ld_exported_symbols_list+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_ld_exported_symbols_list=no
@@ -6547,6 +7015,38 @@ rm -f core conftest.err conftest.$ac_obj
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
+if ${lt_cv_ld_force_load+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_ld_force_load=no
+ cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+ echo "$AR cru libconftest.a conftest.o" >&5
+ $AR cru libconftest.a conftest.o 2>&5
+ echo "$RANLIB libconftest.a" >&5
+ $RANLIB libconftest.a 2>&5
+ cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+ _lt_result=$?
+ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+ lt_cv_ld_force_load=yes
+ else
+ cat conftest.err >&5
+ fi
+ rm -f conftest.err libconftest.a conftest conftest.c
+ rm -rf conftest.dSYM
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+$as_echo "$lt_cv_ld_force_load" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -6574,7 +7074,7 @@ $as_echo "$lt_cv_ld_exported_symbols_lis
else
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
- if test "$DSYMUTIL" != ":"; then
+ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
@@ -6594,7 +7094,7 @@ if test -n "$CPP" && test -d "$CPP"; the
CPP=
fi
if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then :
+ if ${ac_cv_prog_CPP+:} false; then :
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
@@ -6710,7 +7210,7 @@ else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
fi
ac_ext=c
@@ -6722,7 +7222,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6853,7 +7353,7 @@ for ac_header in dlfcn.h
do :
ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
"
-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_DLFCN_H 1
_ACEOF
@@ -6864,6 +7364,8 @@ done
+
+
# Set options
@@ -7016,6 +7518,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
+
test -z "$LN_S" && LN_S="ln -s"
@@ -7037,7 +7540,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
$as_echo_n "checking for objdir... " >&6; }
-if test "${lt_cv_objdir+set}" = set; then :
+if ${lt_cv_objdir+:} false; then :
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
@@ -7065,19 +7568,6 @@ _ACEOF
-
-
-
-
-
-
-
-
-
-
-
-
-
case $host_os in
aix3*)
# AIX sometimes has problems with the GCC collect2 program. For some
@@ -7090,23 +7580,6 @@ aix3*)
;;
esac
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
# Global variables:
ofile=libtool
can_build_shared=yes
@@ -7135,7 +7608,7 @@ for cc_temp in $compiler""; do
*) break;;
esac
done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
# Only perform the check for file, if the check method requires it
@@ -7145,7 +7618,7 @@ file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
@@ -7211,7 +7684,7 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
$as_echo_n "checking for file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
@@ -7344,11 +7817,16 @@ if test -n "$compiler"; then
lt_prog_compiler_no_builtin_flag=
if test "$GCC" = yes; then
- lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+ case $cc_basename in
+ nvcc*)
+ lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+ *)
+ lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+ esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
@@ -7364,15 +7842,15 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7367: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7371: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_rtti_exceptions=yes
@@ -7401,8 +7879,6 @@ fi
lt_prog_compiler_pic=
lt_prog_compiler_static=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
@@ -7450,6 +7926,12 @@ $as_echo_n "checking for $compiler optio
lt_prog_compiler_pic='-fno-common'
;;
+ haiku*)
+ # PIC is the default for Haiku.
+ # The "-static" flag exists, but is broken.
+ lt_prog_compiler_static=
+ ;;
+
hpux*)
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
@@ -7492,6 +7974,13 @@ $as_echo_n "checking for $compiler optio
lt_prog_compiler_pic='-fPIC'
;;
esac
+
+ case $cc_basename in
+ nvcc*) # Cuda Compiler Driver 2.2
+ lt_prog_compiler_wl='-Xlinker '
+ lt_prog_compiler_pic='-Xcompiler -fPIC'
+ ;;
+ esac
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
@@ -7554,7 +8043,13 @@ $as_echo_n "checking for $compiler optio
lt_prog_compiler_pic='--shared'
lt_prog_compiler_static='--static'
;;
- pgcc* | pgf77* | pgf90* | pgf95*)
+ nagfor*)
+ # NAG Fortran compiler
+ lt_prog_compiler_wl='-Wl,-Wl,,'
+ lt_prog_compiler_pic='-PIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
lt_prog_compiler_wl='-Wl,'
@@ -7566,25 +8061,25 @@ $as_echo_n "checking for $compiler optio
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
- xl*)
- # IBM XL C 8.0/Fortran 10.1 on PPC
+ xl* | bgxl* | bgf* | mpixl*)
+ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-qpic'
lt_prog_compiler_static='-qstaticlink'
;;
*)
case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C 5.9
+ *Sun\ F* | *Sun*Fortran*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
- lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_wl=''
;;
- *Sun\ F*)
- # Sun Fortran 8.3 passes all unrecognized flags to the linker
+ *Sun\ C*)
+ # Sun C 5.9
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
- lt_prog_compiler_wl=''
+ lt_prog_compiler_wl='-Wl,'
;;
esac
;;
@@ -7616,7 +8111,7 @@ $as_echo_n "checking for $compiler optio
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
case $cc_basename in
- f77* | f90* | f95*)
+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
lt_prog_compiler_wl='-Qoption ld ';;
*)
lt_prog_compiler_wl='-Wl,';;
@@ -7673,13 +8168,17 @@ case $host_os in
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
-$as_echo "$lt_prog_compiler_pic" >&6; }
-
-
-
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
#
# Check to make sure the PIC flag actually works.
@@ -7687,7 +8186,7 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
if test -n "$lt_prog_compiler_pic"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
+if ${lt_cv_prog_compiler_pic_works+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
@@ -7703,15 +8202,15 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7706: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7710: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_pic_works=yes
@@ -7740,13 +8239,18 @@ fi
+
+
+
+
+
#
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
+if ${lt_cv_prog_compiler_static_works+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
@@ -7759,7 +8263,7 @@ else
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_static_works=yes
@@ -7789,7 +8293,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
+if ${lt_cv_prog_compiler_c_o+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
@@ -7808,16 +8312,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7811: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7815: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
@@ -7844,7 +8348,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
+if ${lt_cv_prog_compiler_c_o+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
@@ -7863,16 +8367,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7866: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7870: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
@@ -7982,13 +8486,39 @@ $as_echo_n "checking whether the $compil
openbsd*)
with_gnu_ld=no
;;
- linux* | k*bsd*-gnu)
+ linux* | k*bsd*-gnu | gnu*)
link_all_deplibs=no
;;
esac
ld_shlibs=yes
+
+ # On some targets, GNU ld is compatible enough with the native linker
+ # that we're better off using the native interface for both.
+ lt_use_gnu_ld_interface=no
if test "$with_gnu_ld" = yes; then
+ case $host_os in
+ aix*)
+ # The AIX port of GNU ld has always aspired to compatibility
+ # with the native linker. However, as the warning in the GNU ld
+ # block says, versions before 2.19.5* couldn't really create working
+ # shared libraries, regardless of the interface used.
+ case `$LD -v 2>&1` in
+ *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+ *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
+ *\ \(GNU\ Binutils\)\ [3-9]*) ;;
+ *)
+ lt_use_gnu_ld_interface=yes
+ ;;
+ esac
+ ;;
+ *)
+ lt_use_gnu_ld_interface=yes
+ ;;
+ esac
+ fi
+
+ if test "$lt_use_gnu_ld_interface" = yes; then
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -8022,11 +8552,12 @@ $as_echo_n "checking whether the $compil
ld_shlibs=no
cat <<_LT_EOF 1>&2
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** Warning: the GNU linker, at least up to release 2.19, is reported
*** to be unable to reliably create shared libraries on AIX.
*** Therefore, libtool is disabling shared libraries support. If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
_LT_EOF
fi
@@ -8062,10 +8593,12 @@ _LT_EOF
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
+ export_dynamic_flag_spec='${wl}--export-all-symbols'
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -8083,6 +8616,11 @@ _LT_EOF
fi
;;
+ haiku*)
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ link_all_deplibs=yes
+ ;;
+
interix[3-9]*)
hardcode_direct=no
hardcode_shlibpath_var=no
@@ -8108,15 +8646,16 @@ _LT_EOF
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
&& test "$tmp_diet" = no
then
- tmp_addflag=
+ tmp_addflag=' $pic_flag'
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ pgf77* | pgf90* | pgf95* | pgfortran*)
+ # Portland Group f77 and f90 compilers
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -8127,13 +8666,17 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
whole_archive_flag_spec=
tmp_sharedflag='--shared' ;;
- xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
tmp_sharedflag='-qmkshrobj'
tmp_addflag= ;;
+ nvcc*) # Cuda Compiler Driver 2.2
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ compiler_needs_object=yes
+ ;;
esac
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*) # Sun C 5.9
- whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
compiler_needs_object=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
@@ -8149,17 +8692,17 @@ _LT_EOF
fi
case $cc_basename in
- xlf*)
+ xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
hardcode_libdir_flag_spec=
hardcode_libdir_flag_spec_ld='-rpath $libdir'
- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
if test "x$supports_anon_versioning" = xyes; then
archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
echo "local: *; };" >> $output_objdir/$libname.ver~
- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
fi
;;
esac
@@ -8173,8 +8716,8 @@ _LT_EOF
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
fi
;;
@@ -8192,8 +8735,8 @@ _LT_EOF
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
ld_shlibs=no
fi
@@ -8239,8 +8782,8 @@ _LT_EOF
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
ld_shlibs=no
fi
@@ -8280,8 +8823,10 @@ _LT_EOF
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
+ # Also, AIX nm treats weak defined symbols like other global
+ # defined symbols, whereas GNU nm marks them as "W".
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
@@ -8369,7 +8914,13 @@ _LT_EOF
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ if test "${lt_cv_aix_libpath+set}" = set; then
+ aix_libpath=$lt_cv_aix_libpath
+else
+ if ${lt_cv_aix_libpath_+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -8382,25 +8933,32 @@ main ()
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
-lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
- /^0/ {
- s/^0 *\(.*\)$/\1/
- p
- }
- }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\([^ ]*\) *$/\1/
+ p
+ }
+ }'
+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+ if test -z "$lt_cv_aix_libpath_"; then
+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ if test -z "$lt_cv_aix_libpath_"; then
+ lt_cv_aix_libpath_="/usr/lib:/lib"
+ fi
+
+fi
+
+ aix_libpath=$lt_cv_aix_libpath_
+fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
@@ -8409,7 +8967,13 @@ if test -z "$aix_libpath"; then aix_libp
else
# Determine the default libpath from the value encoded in an
# empty executable.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ if test "${lt_cv_aix_libpath+set}" = set; then
+ aix_libpath=$lt_cv_aix_libpath
+else
+ if ${lt_cv_aix_libpath_+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -8422,30 +8986,42 @@ main ()
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
-lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
- /^0/ {
- s/^0 *\(.*\)$/\1/
- p
- }
- }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\([^ ]*\) *$/\1/
+ p
+ }
+ }'
+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+ if test -z "$lt_cv_aix_libpath_"; then
+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ if test -z "$lt_cv_aix_libpath_"; then
+ lt_cv_aix_libpath_="/usr/lib:/lib"
+ fi
+
+fi
+
+ aix_libpath=$lt_cv_aix_libpath_
+fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
- # Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec='$convenience'
+ if test "$with_gnu_ld" = yes; then
+ # We only use this code for GNU lds that support --whole-archive.
+ whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ else
+ # Exported symbols can be pulled into shared objects from archives
+ whole_archive_flag_spec='$convenience'
+ fi
archive_cmds_need_lc=yes
# This is similar to how AIX traditionally builds its shared libraries.
archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
@@ -8477,20 +9053,63 @@ if test -z "$aix_libpath"; then aix_libp
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
- hardcode_libdir_flag_spec=' '
- allow_undefined_flag=unsupported
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
- archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
- # The linker will automatically build a .lib file if we build a DLL.
- old_archive_from_new_cmds='true'
- # FIXME: Should let the user specify the lib program.
- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
- fix_srcfile_path='`cygpath -w "$srcfile"`'
- enable_shared_with_static_runtimes=yes
+ case $cc_basename in
+ cl*)
+ # Native MSVC
+ hardcode_libdir_flag_spec=' '
+ allow_undefined_flag=unsupported
+ always_export_symbols=yes
+ file_list_spec='@'
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+ else
+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+ fi~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
+ # The linker will not automatically build a static lib if we build a DLL.
+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
+ enable_shared_with_static_runtimes=yes
+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ # Don't use ranlib
+ old_postinstall_cmds='chmod 644 $oldlib'
+ postlink_cmds='lt_outputfile="@OUTPUT@"~
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile="$lt_outputfile.exe"
+ lt_tool_outputfile="$lt_tool_outputfile.exe"
+ ;;
+ esac~
+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
+ ;;
+ *)
+ # Assume MSVC wrapper
+ hardcode_libdir_flag_spec=' '
+ allow_undefined_flag=unsupported
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+ # The linker will automatically build a .lib file if we build a DLL.
+ old_archive_from_new_cmds='true'
+ # FIXME: Should let the user specify the lib program.
+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+ enable_shared_with_static_runtimes=yes
+ ;;
+ esac
;;
darwin* | rhapsody*)
@@ -8500,7 +9119,11 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
- whole_archive_flag_spec=''
+ if test "$lt_cv_ld_force_load" = "yes"; then
+ whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ else
+ whole_archive_flag_spec=''
+ fi
link_all_deplibs=yes
allow_undefined_flag="$_lt_dar_allow_undefined"
case $cc_basename in
@@ -8508,7 +9131,7 @@ if test -z "$aix_libpath"; then aix_libp
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
- output_verbose_link_cmd=echo
+ output_verbose_link_cmd=func_echo_all
archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -8551,7 +9174,7 @@ if test -z "$aix_libpath"; then aix_libp
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
freebsd* | dragonfly*)
- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
@@ -8559,7 +9182,7 @@ if test -z "$aix_libpath"; then aix_libp
hpux9*)
if test "$GCC" = yes; then
- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
else
archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
@@ -8574,8 +9197,8 @@ if test -z "$aix_libpath"; then aix_libp
;;
hpux10*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
fi
@@ -8593,16 +9216,16 @@ if test -z "$aix_libpath"; then aix_libp
;;
hpux11*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
case $host_cpu in
hppa*64*)
archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
@@ -8614,7 +9237,46 @@ if test -z "$aix_libpath"; then aix_libp
archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+
+ # Older versions of the 11.00 compiler do not understand -b yet
+ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+$as_echo_n "checking if $CC understands -b... " >&6; }
+if ${lt_cv_prog_compiler__b+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_prog_compiler__b=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -b"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&5
+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler__b=yes
+ fi
+ else
+ lt_cv_prog_compiler__b=yes
+ fi
+ fi
+ $RM -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+$as_echo "$lt_cv_prog_compiler__b" >&6; }
+
+if test x"$lt_cv_prog_compiler__b" = xyes; then
+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+else
+ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+fi
+
;;
esac
fi
@@ -8642,26 +9304,39 @@ if test -z "$aix_libpath"; then aix_libp
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ # This should be the same for all languages, so no per-tag cache variable.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+if ${lt_cv_irix_exported_symbol+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-int foo(void) {}
+int foo (void) { return 0; }
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-
+ lt_cv_irix_exported_symbol=yes
+else
+ lt_cv_irix_exported_symbol=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS="$save_LDFLAGS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
+ if test "$lt_cv_irix_exported_symbol" = yes; then
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+ fi
else
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@ -8723,17 +9398,17 @@ rm -f core conftest.err conftest.$ac_obj
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
;;
osf3*)
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
allow_undefined_flag=' -expect_unresolved \*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@ -8743,13 +9418,13 @@ rm -f core conftest.err conftest.$ac_obj
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag=' -expect_unresolved \*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
@@ -8762,9 +9437,9 @@ rm -f core conftest.err conftest.$ac_obj
no_undefined_flag=' -z defs'
if test "$GCC" = yes; then
wlarc='${wl}'
- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
else
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
@@ -8952,44 +9627,50 @@ x|xyes)
# to ld, don't add -lc before -lgcc.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
- $RM conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+if ${lt_cv_archive_cmds_need_lc+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ $RM conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } 2>conftest.err; then
- soname=conftest
- lib=conftest
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$lt_prog_compiler_wl
- pic_flag=$lt_prog_compiler_pic
- compiler_flags=-v
- linker_flags=-v
- verstring=
- output_objdir=.
- libname=conftest
- lt_save_allow_undefined_flag=$allow_undefined_flag
- allow_undefined_flag=
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+ soname=conftest
+ lib=conftest
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$lt_prog_compiler_wl
+ pic_flag=$lt_prog_compiler_pic
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+ output_objdir=.
+ libname=conftest
+ lt_save_allow_undefined_flag=$allow_undefined_flag
+ allow_undefined_flag=
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
(eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- then
- archive_cmds_need_lc=no
- else
- archive_cmds_need_lc=yes
- fi
- allow_undefined_flag=$lt_save_allow_undefined_flag
- else
- cat conftest.err 1>&5
- fi
- $RM conftest*
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
-$as_echo "$archive_cmds_need_lc" >&6; }
+ then
+ lt_cv_archive_cmds_need_lc=no
+ else
+ lt_cv_archive_cmds_need_lc=yes
+ fi
+ allow_undefined_flag=$lt_save_allow_undefined_flag
+ else
+ cat conftest.err 1>&5
+ fi
+ $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+ archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
;;
esac
fi
@@ -9160,16 +9841,23 @@ if test "$GCC" = yes; then
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+ case $host_os in
+ mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
+ *) lt_sed_strip_eq="s,=/,/,g" ;;
+ esac
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+ case $lt_search_path_spec in
+ *\;*)
# if the path contains ";" then we assume it to be the separator
# otherwise default to the standard path separator (i.e. ":") - it is
# assumed that no part of a normal pathname contains ";" but that should
# okay in the real world where ";" in dirpaths is itself problematic.
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
- else
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+ ;;
+ *)
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+ ;;
+ esac
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
@@ -9182,7 +9870,7 @@ if test "$GCC" = yes; then
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
- lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
@@ -9202,7 +9890,13 @@ BEGIN {RS=" "; FS="/|\n";} {
if (lt_foo != "") { lt_freq[lt_foo]++; }
if (lt_freq[lt_foo] == 1) { print lt_foo; }
}'`
- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+ # AWK program above erroneously prepends '/' to C:/dos/paths
+ # for these hosts.
+ case $host_os in
+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+ $SED 's,/\([A-Za-z]:\),\1,g'` ;;
+ esac
+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
@@ -9290,7 +9984,7 @@ amigaos*)
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
;;
esac
;;
@@ -9321,8 +10015,9 @@ cygwin* | mingw* | pw32* | cegcc*)
need_version=no
need_lib_prefix=no
- case $GCC,$host_os in
- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+ case $GCC,$cc_basename in
+ yes,*)
+ # gcc
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
@@ -9343,36 +10038,83 @@ cygwin* | mingw* | pw32* | cegcc*)
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
- # It is most probably a Windows format PATH printed by
- # mingw gcc, but we are running on Cygwin. Gcc prints its search
- # path with ; separators, and with drive letters. We can handle the
- # drive letters (cygwin fileutils understands them), so leave them,
- # especially as we might pass files found there to a mingw objdump,
- # which wouldn't understand a cygwinified path. Ahh.
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
;;
esac
+ dynamic_linker='Win32 ld.exe'
+ ;;
+
+ *,cl*)
+ # Native MSVC
+ libname_spec='$name'
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ library_names_spec='${libname}.dll.lib'
+
+ case $build_os in
+ mingw*)
+ sys_lib_search_path_spec=
+ lt_save_ifs=$IFS
+ IFS=';'
+ for lt_path in $LIB
+ do
+ IFS=$lt_save_ifs
+ # Let DOS variable expansion print the short 8.3 style file name.
+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+ done
+ IFS=$lt_save_ifs
+ # Convert to MSYS style.
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+ ;;
+ cygwin*)
+ # Convert to unix form, then to dos form, then back to unix form
+ # but this time dos style (no spaces!) so that the unix form looks
+ # like /cygdrive/c/PROGRA~1:/cygdr...
+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ ;;
+ *)
+ sys_lib_search_path_spec="$LIB"
+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+ # It is most probably a Windows format PATH.
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+ else
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
+ # FIXME: find the short name or the path components, as spaces are
+ # common. (e.g. "Program Files" -> "PROGRA~1")
+ ;;
+ esac
+
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
+ postinstall_cmds='base_file=`basename \${file}`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
+ shlibpath_overrides_runpath=yes
+ dynamic_linker='Win32 link.exe'
;;
*)
+ # Assume MSVC wrapper
library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ dynamic_linker='Win32 ld.exe'
;;
esac
- dynamic_linker='Win32 ld.exe'
# FIXME: first we should search . and the directory the executable is in
shlibpath_var=PATH
;;
@@ -9456,6 +10198,20 @@ gnu*)
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
+haiku*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ dynamic_linker="$host_os runtime_loader"
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
hardcode_into_libs=yes
;;
@@ -9501,8 +10257,10 @@ hpux9* | hpux10* | hpux11*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
postinstall_cmds='chmod 555 $lib'
+ # or fails outright, so override atomically:
+ install_override_mode=555
;;
interix[3-9]*)
@@ -9569,12 +10327,17 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
+
# Some binutils ld are patched to set DT_RUNPATH
- save_LDFLAGS=$LDFLAGS
- save_libdir=$libdir
- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_shlibpath_overrides_runpath=no
+ save_LDFLAGS=$LDFLAGS
+ save_libdir=$libdir
+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -9587,13 +10350,17 @@ main ()
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
- shlibpath_overrides_runpath=yes
+ lt_cv_shlibpath_overrides_runpath=yes
fi
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- LDFLAGS=$save_LDFLAGS
- libdir=$save_libdir
+ LDFLAGS=$save_LDFLAGS
+ libdir=$save_libdir
+
+fi
+
+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
@@ -9602,7 +10369,7 @@ rm -f core conftest.err conftest.$ac_obj
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -9917,6 +10684,11 @@ fi
+
+
+
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
@@ -9989,7 +10761,7 @@ else
# if libdl is installed we need to link against it
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+if ${ac_cv_lib_dl_dlopen+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -10023,7 +10795,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
@@ -10037,12 +10809,12 @@ fi
*)
ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = x""yes; then :
+if test "x$ac_cv_func_shl_load" = xyes; then :
lt_cv_dlopen="shl_load"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
+if ${ac_cv_lib_dld_shl_load+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -10076,16 +10848,16 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
else
ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = x""yes; then :
+if test "x$ac_cv_func_dlopen" = xyes; then :
lt_cv_dlopen="dlopen"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+if ${ac_cv_lib_dl_dlopen+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -10119,12 +10891,12 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
+if ${ac_cv_lib_svld_dlopen+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -10158,12 +10930,12 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
+if ${ac_cv_lib_dld_dld_link+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -10197,7 +10969,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
@@ -10238,7 +11010,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self+set}" = set; then :
+if ${lt_cv_dlopen_self+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
@@ -10247,7 +11019,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10250 "configure"
+#line $LINENO "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10288,7 +11060,13 @@ else
# endif
#endif
-void fnord() { int i=42;}
+/* When -fvisbility=hidden is used, assume the code has been annotated
+ correspondingly for the symbols needed. */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -10297,7 +11075,11 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else
+ {
+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else puts (dlerror ());
+ }
/* dlclose (self); */
}
else
@@ -10334,7 +11116,7 @@ $as_echo "$lt_cv_dlopen_self" >&6; }
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self_static+set}" = set; then :
+if ${lt_cv_dlopen_self_static+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
@@ -10343,7 +11125,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10346 "configure"
+#line $LINENO "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10384,7 +11166,13 @@ else
# endif
#endif
-void fnord() { int i=42;}
+/* When -fvisbility=hidden is used, assume the code has been annotated
+ correspondingly for the symbols needed. */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -10393,7 +11181,11 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else
+ {
+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else puts (dlerror ());
+ }
/* dlclose (self); */
}
else
@@ -10575,7 +11367,7 @@ CC="$lt_save_CC"
for ac_header in sys/sockio.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "sys/sockio.h" "ac_cv_header_sys_sockio_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_sockio_h" = x""yes; then :
+if test "x$ac_cv_header_sys_sockio_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SYS_SOCKIO_H 1
_ACEOF
@@ -10609,13 +11401,14 @@ GTK_REQUIRED=2.90.4
+
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
@@ -10658,7 +11451,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
set dummy pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
@@ -10749,6 +11542,7 @@ if test -n "$NETTOOL_CFLAGS"; then
gmodule-export-2.0
gnome-doc-utils
libgtop-2.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -10777,6 +11571,7 @@ if test -n "$NETTOOL_LIBS"; then
gmodule-export-2.0
gnome-doc-utils
libgtop-2.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -10796,13 +11591,13 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- NETTOOL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-3.0 >= $GTK_REQUIRED
+ NETTOOL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= $GTK_REQUIRED
gio-2.0 >= $GIO_REQUIRED
gmodule-export-2.0
gnome-doc-utils
libgtop-2.0" 2>&1`
else
- NETTOOL_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-3.0 >= $GTK_REQUIRED
+ NETTOOL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= $GTK_REQUIRED
gio-2.0 >= $GIO_REQUIRED
gmodule-export-2.0
gnome-doc-utils
@@ -10839,7 +11634,7 @@ and NETTOOL_LIBS to avoid the need to ca
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
NETTOOL_CFLAGS=$pkg_cv_NETTOOL_CFLAGS
NETTOOL_LIBS=$pkg_cv_NETTOOL_LIBS
@@ -10892,7 +11687,7 @@ fi
set dummy intltool-update; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
+if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then :
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_UPDATE in
@@ -10932,7 +11727,7 @@ fi
set dummy intltool-merge; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
+if ${ac_cv_path_INTLTOOL_MERGE+:} false; then :
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_MERGE in
@@ -10972,7 +11767,7 @@ fi
set dummy intltool-extract; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
+if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then :
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_EXTRACT in
@@ -11133,7 +11928,7 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
set dummy xgettext; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+if ${ac_cv_path_XGETTEXT+:} false; then :
$as_echo_n "(cached) " >&6
else
case $XGETTEXT in
@@ -11173,7 +11968,7 @@ fi
set dummy msgmerge; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGMERGE+set}" = set; then :
+if ${ac_cv_path_MSGMERGE+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MSGMERGE in
@@ -11213,7 +12008,7 @@ fi
set dummy msgfmt; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then :
+if ${ac_cv_path_MSGFMT+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MSGFMT in
@@ -11253,7 +12048,7 @@ fi
set dummy gmsgfmt; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+if ${ac_cv_path_GMSGFMT+:} false; then :
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
@@ -11304,7 +12099,7 @@ fi
set dummy perl; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
+if ${ac_cv_path_INTLTOOL_PERL+:} false; then :
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_PERL in
@@ -11388,7 +12183,7 @@ else
case $host in
*-*-solaris*)
ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
DATADIRNAME=share
else
DATADIRNAME=lib
@@ -11420,7 +12215,7 @@ _ACEOF
for ac_header in locale.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
-if test "x$ac_cv_header_locale_h" = x""yes; then :
+if test "x$ac_cv_header_locale_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LOCALE_H 1
_ACEOF
@@ -11432,7 +12227,7 @@ done
if test $ac_cv_header_locale_h = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
$as_echo_n "checking for LC_MESSAGES... " >&6; }
-if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
+if ${am_cv_val_LC_MESSAGES+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11472,7 +12267,7 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>
INTLLIBS=
ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
-if test "x$ac_cv_header_libintl_h" = x""yes; then :
+if test "x$ac_cv_header_libintl_h" = xyes; then :
gt_cv_func_dgettext_libintl="no"
libintl_extra_libs=""
@@ -11481,7 +12276,7 @@ if test "x$ac_cv_header_libintl_h" = x""
#
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
$as_echo_n "checking for ngettext in libc... " >&6; }
-if test "${gt_cv_func_ngettext_libc+set}" = set; then :
+if ${gt_cv_func_ngettext_libc+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11512,7 +12307,7 @@ $as_echo "$gt_cv_func_ngettext_libc" >&6
if test "$gt_cv_func_ngettext_libc" = "yes" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
$as_echo_n "checking for dgettext in libc... " >&6; }
-if test "${gt_cv_func_dgettext_libc+set}" = set; then :
+if ${gt_cv_func_dgettext_libc+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11545,7 +12340,7 @@ $as_echo "$gt_cv_func_dgettext_libc" >&6
for ac_func in bind_textdomain_codeset
do :
ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_BIND_TEXTDOMAIN_CODESET 1
_ACEOF
@@ -11564,7 +12359,7 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
+if ${ac_cv_lib_intl_bindtextdomain+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -11598,10 +12393,10 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
+if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
$as_echo_n "checking for ngettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
+if ${ac_cv_lib_intl_ngettext+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -11635,10 +12430,10 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
+if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
$as_echo_n "checking for dgettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
+if ${ac_cv_lib_intl_dgettext+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -11672,7 +12467,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
+if test "x$ac_cv_lib_intl_dgettext" = xyes; then :
gt_cv_func_dgettext_libintl=yes
fi
@@ -11688,7 +12483,7 @@ $as_echo_n "checking if -liconv is neede
$as_echo "" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
$as_echo_n "checking for ngettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
+if ${ac_cv_lib_intl_ngettext+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -11722,10 +12517,10 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
+if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
$as_echo_n "checking for dcgettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
+if ${ac_cv_lib_intl_dcgettext+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -11759,7 +12554,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
+if test "x$ac_cv_lib_intl_dcgettext" = xyes; then :
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
else
@@ -11784,7 +12579,7 @@ fi
for ac_func in bind_textdomain_codeset
do :
ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_BIND_TEXTDOMAIN_CODESET 1
_ACEOF
@@ -11822,7 +12617,7 @@ $as_echo "#define HAVE_GETTEXT 1" >>conf
set dummy msgfmt; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then :
+if ${ac_cv_path_MSGFMT+:} false; then :
$as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
@@ -11859,7 +12654,7 @@ fi
for ac_func in dcgettext
do :
ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
-if test "x$ac_cv_func_dcgettext" = x""yes; then :
+if test "x$ac_cv_func_dcgettext" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_DCGETTEXT 1
_ACEOF
@@ -11900,7 +12695,7 @@ fi
set dummy gmsgfmt; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+if ${ac_cv_path_GMSGFMT+:} false; then :
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
@@ -11941,7 +12736,7 @@ fi
set dummy xgettext; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+if ${ac_cv_path_XGETTEXT+:} false; then :
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
@@ -11992,7 +12787,7 @@ else
case $host in
*-*-solaris*)
ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
CATOBJEXT=.gmo
DATADIRNAME=share
else
@@ -12218,7 +13013,7 @@ if test "${enable_schemas_compile+set}"
enableval=$enable_schemas_compile; case ${enableval} in
yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;;
no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
- *) as_fn_error $? "bad value ${enableval} for --enable-schemas-compile" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${enableval} for --enable-schemas-compile" "$LINENO" 5 ;;
esac
fi
@@ -12229,13 +13024,14 @@ fi
+
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
@@ -12278,7 +13074,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
set dummy pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
@@ -12351,7 +13147,7 @@ fi
set dummy glib-compile-schemas; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GLIB_COMPILE_SCHEMAS+set}" = set; then :
+if ${ac_cv_path_GLIB_COMPILE_SCHEMAS+:} false; then :
$as_echo_n "(cached) " >&6
else
case $GLIB_COMPILE_SCHEMAS in
@@ -12639,10 +13435,21 @@ $as_echo "$as_me: WARNING: cache variabl
:end' >>confcache
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
- test "x$cache_file" != "x/dev/null" &&
+ if test "x$cache_file" != "x/dev/null"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
$as_echo "$as_me: updating cache $cache_file" >&6;}
- cat confcache >$cache_file
+ if test ! -f "$cache_file" || test -h "$cache_file"; then
+ cat confcache >"$cache_file"
+ else
+ case $cache_file in #(
+ */* | ?:*)
+ mv -f confcache "$cache_file"$$ &&
+ mv -f "$cache_file"$$ "$cache_file" ;; #(
+ *)
+ mv -f confcache "$cache_file" ;;
+ esac
+ fi
+ fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -12706,7 +13513,7 @@ if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -12807,6 +13614,7 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
+as_myself=
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -13113,8 +13921,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by GNOME Nettool $as_me 3.0.0, which was
-generated by GNU Autoconf 2.67. Invocation command line was
+This file was extended by GNOME Nettool $as_me 3.0.1, which was
+generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -13180,8 +13988,8 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-GNOME Nettool config.status 3.0.0
-configured by $0, generated by GNU Autoconf 2.67,
+GNOME Nettool config.status 3.0.1
+configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -13309,131 +14117,153 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac
sed_quote_subst='$sed_quote_subst'
double_quote_subst='$double_quote_subst'
delay_variable_subst='$delay_variable_subst'
-macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
-enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
-host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
-host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
-host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
-build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
-build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
-build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
-SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
-Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
-GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
-EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
-FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
-LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
-NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
-LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
-exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
-AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
-GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
-SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
-ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
-need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
-LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
-libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
-fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
-version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
-striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
LTCC='$LTCC'
LTCFLAGS='$LTCFLAGS'
compiler='$compiler_DEFAULT'
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+ eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
# Quote evaled strings.
-for var in SED \
+for var in SHELL \
+ECHO \
+SED \
GREP \
EGREP \
FGREP \
@@ -13446,8 +14276,13 @@ reload_flag \
OBJDUMP \
deplibs_check_method \
file_magic_cmd \
+file_magic_glob \
+want_nocaseglob \
+DLLTOOL \
+sharedlib_from_linklib_cmd \
AR \
AR_FLAGS \
+archiver_list_spec \
STRIP \
RANLIB \
CC \
@@ -13457,14 +14292,14 @@ lt_cv_sys_global_symbol_pipe \
lt_cv_sys_global_symbol_to_cdecl \
lt_cv_sys_global_symbol_to_c_name_address \
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-SHELL \
-ECHO \
+nm_file_list_spec \
lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_wl \
lt_prog_compiler_pic \
+lt_prog_compiler_wl \
lt_prog_compiler_static \
lt_cv_prog_compiler_c_o \
need_locks \
+MANIFEST_TOOL \
DSYMUTIL \
NMEDIT \
LIPO \
@@ -13480,7 +14315,6 @@ no_undefined_flag \
hardcode_libdir_flag_spec \
hardcode_libdir_flag_spec_ld \
hardcode_libdir_separator \
-fix_srcfile_path \
exclude_expsyms \
include_expsyms \
file_list_spec \
@@ -13488,12 +14322,13 @@ variables_saved_for_relink \
libname_spec \
library_names_spec \
soname_spec \
+install_override_mode \
finish_eval \
old_striplib \
striplib; do
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -13515,14 +14350,15 @@ module_cmds \
module_expsym_cmds \
export_symbols_cmds \
prelink_cmds \
+postlink_cmds \
postinstall_cmds \
postuninstall_cmds \
finish_cmds \
sys_lib_search_path_spec \
sys_lib_dlsearch_path_spec; do
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -13530,12 +14366,6 @@ sys_lib_dlsearch_path_spec; do
esac
done
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
- ;;
-esac
-
ac_aux_dir='$ac_aux_dir'
xsi_shell='$xsi_shell'
lt_shell_append='$lt_shell_append'
@@ -13589,7 +14419,7 @@ do
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
done
@@ -13612,9 +14442,10 @@ fi
# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
- tmp=
+ tmp= ac_tmp=
trap 'exit_status=$?
- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+ : "${ac_tmp:=$tmp}"
+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
' 0
trap 'as_fn_exit 1' 1 2 13 15
}
@@ -13622,12 +14453,13 @@ $debug ||
{
tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -n "$tmp" && test -d "$tmp"
+ test -d "$tmp"
} ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@ -13649,7 +14481,7 @@ else
ac_cs_awk_cr=$ac_cr
fi
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
_ACEOF
@@ -13677,7 +14509,7 @@ done
rm -f conf$$subs.sh
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
_ACEOF
sed -n '
h
@@ -13725,7 +14557,7 @@ t delim
rm -f conf$$subs.awk
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
for (key in S) S_is_set[key] = 1
FS = ""
@@ -13757,7 +14589,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
else
cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
|| as_fn_error $? "could not setup config files machinery" "$LINENO" 5
_ACEOF
@@ -13791,7 +14623,7 @@ fi # test -n "$CONFIG_FILES"
# No need to generate them if there are no CONFIG_HEADERS.
# This happens for instance with `./config.status Makefile'.
if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
BEGIN {
_ACEOF
@@ -13803,8 +14635,8 @@ _ACEOF
# handling of long lines.
ac_delim='%!_!# '
for ac_last_try in false false :; do
- ac_t=`sed -n "/$ac_delim/p" confdefs.h`
- if test -z "$ac_t"; then
+ ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+ if test -z "$ac_tt"; then
break
elif $ac_last_try; then
as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
@@ -13905,7 +14737,7 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -13924,7 +14756,7 @@ do
for ac_f
do
case $ac_f in
- -) ac_f="$tmp/stdin";;
+ -) ac_f="$ac_tmp/stdin";;
*) # Look for the file first in the build tree, then in the source tree
# (if the path is not absolute). The absolute path cannot be DOS-style,
# because $ac_f cannot contain `:'.
@@ -13933,7 +14765,7 @@ do
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
@@ -13959,8 +14791,8 @@ $as_echo "$as_me: creating $ac_file" >&6
esac
case $ac_tag in
- *:-:* | *:-) cat >"$tmp/stdin" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ *:-:* | *:-) cat >"$ac_tmp/stdin" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -14096,21 +14928,22 @@ s&@INSTALL@&$ac_INSTALL&;t t
s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
+ "$ac_tmp/out"`; test -z "$ac_out"; } &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined" >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined" >&2;}
- rm -f "$tmp/stdin"
+ rm -f "$ac_tmp/stdin"
case $ac_file in
- -) cat "$tmp/out" && rm -f "$tmp/out";;
- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
esac \
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
;;
@@ -14121,20 +14954,20 @@ which seems to be undefined. Please mak
if test x"$ac_file" != x-; then
{
$as_echo "/* $configure_input */" \
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
- } >"$tmp/config.h" \
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+ } >"$ac_tmp/config.h" \
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
rm -f "$ac_file"
- mv "$tmp/config.h" "$ac_file" \
+ mv "$ac_tmp/config.h" "$ac_file" \
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
fi
else
$as_echo "/* $configure_input */" \
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
|| as_fn_error $? "could not create -" "$LINENO" 5
fi
# Compute "$ac_file"'s index in $config_headers.
@@ -14296,7 +15129,8 @@ $as_echo X"$file" |
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+# Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
@@ -14344,6 +15178,12 @@ pic_mode=$pic_mode
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that protects backslashes.
+ECHO=$lt_ECHO
+
# The host system.
host_alias=$host_alias
host=$host
@@ -14393,9 +15233,11 @@ SP2NL=$lt_lt_SP2NL
# turn newlines into spaces.
NL2SP=$lt_lt_NL2SP
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
+# convert \$build file names to \$host format.
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+
+# convert \$build files to toolchain format.
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
# An object symbol dumper.
OBJDUMP=$lt_OBJDUMP
@@ -14403,13 +15245,30 @@ OBJDUMP=$lt_OBJDUMP
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
-# Command to use when deplibs_check_method == "file_magic".
+# Command to use when deplibs_check_method = "file_magic".
file_magic_cmd=$lt_file_magic_cmd
+# How to find potential files when deplibs_check_method = "file_magic".
+file_magic_glob=$lt_file_magic_glob
+
+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
+want_nocaseglob=$lt_want_nocaseglob
+
+# DLL creation program.
+DLLTOOL=$lt_DLLTOOL
+
+# Command to associate shared and link libraries.
+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
+
# The archiver.
AR=$lt_AR
+
+# Flags to create an archive.
AR_FLAGS=$lt_AR_FLAGS
+# How to feed a file listing to the archiver.
+archiver_list_spec=$lt_archiver_list_spec
+
# A symbol stripping program.
STRIP=$lt_STRIP
@@ -14418,6 +15277,9 @@ RANLIB=$lt_RANLIB
old_postinstall_cmds=$lt_old_postinstall_cmds
old_postuninstall_cmds=$lt_old_postuninstall_cmds
+# Whether to use a lock for old archive extraction.
+lock_old_archive_extraction=$lock_old_archive_extraction
+
# A C compiler.
LTCC=$lt_CC
@@ -14436,14 +15298,14 @@ global_symbol_to_c_name_address=$lt_lt_c
# Transform the output of nm in a C name address pair when lib prefix is needed.
global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
+# Specify filename containing input files for \$NM.
+nm_file_list_spec=$lt_nm_file_list_spec
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
+# The root where to search for dependent libraries,and in which our libraries should be installed.
+lt_sysroot=$lt_sysroot
-# An echo program that does not interpret backslashes.
-ECHO=$lt_ECHO
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
# Used to examine libraries when file_magic_cmd begins with "file".
MAGIC_CMD=$MAGIC_CMD
@@ -14451,6 +15313,9 @@ MAGIC_CMD=$MAGIC_CMD
# Must we lock files when doing compilation?
need_locks=$lt_need_locks
+# Manifest tool.
+MANIFEST_TOOL=$lt_MANIFEST_TOOL
+
# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
DSYMUTIL=$lt_DSYMUTIL
@@ -14507,6 +15372,9 @@ library_names_spec=$lt_library_names_spe
# The coded name of the library, if different from the real name.
soname_spec=$lt_soname_spec
+# Permission mode override for installation of shared libraries.
+install_override_mode=$lt_install_override_mode
+
# Command to use after installation of a shared archive.
postinstall_cmds=$lt_postinstall_cmds
@@ -14546,6 +15414,10 @@ striplib=$lt_striplib
# The linker used to build libraries.
LD=$lt_LD
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds
@@ -14558,12 +15430,12 @@ with_gcc=$GCC
# Compiler flag to turn off builtin functions.
no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
# Additional compiler flags for building library objects.
pic_flag=$lt_lt_prog_compiler_pic
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
# Compiler flag to prevent dynamic linking.
link_static_flag=$lt_lt_prog_compiler_static
@@ -14650,9 +15522,6 @@ inherit_rpath=$inherit_rpath
# Whether libtool must link a program against all its dependency libraries.
link_all_deplibs=$link_all_deplibs
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
# Set to "yes" if exported symbols are required.
always_export_symbols=$always_export_symbols
@@ -14668,6 +15537,9 @@ include_expsyms=$lt_include_expsyms
# Commands necessary for linking programs (against libraries) with templates.
prelink_cmds=$lt_prelink_cmds
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds
+
# Specify filename containing input files.
file_list_spec=$lt_file_list_spec
@@ -14700,212 +15572,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
# if finds mixed CR/LF and LF-only lines. Since sed operates in
# text mode, it properly converts lines to CR/LF. This bash problem
# is reportedly fixed, but why not run on old versions too?
- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
- || (rm -f "$cfgfile"; exit 1)
-
- case $xsi_shell in
- yes)
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
-}
-
-# func_basename file
-func_basename ()
-{
- func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-# dirname: Compute the dirname of FILE. If nonempty,
-# add APPEND to the result, otherwise set result
-# to NONDIR_REPLACEMENT.
-# value returned in "$func_dirname_result"
-# basename: Compute filename of FILE.
-# value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
- func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
- # positional parameters, so assign one to ordinary parameter first.
- func_stripname_result=${3}
- func_stripname_result=${func_stripname_result#"${1}"}
- func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
- func_opt_split_opt=${1%%=*}
- func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
- case ${1} in
- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- *) func_lo2o_result=${1} ;;
- esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
- func_arith_result=$(( $* ))
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=${#1}
-}
-
-_LT_EOF
- ;;
- *) # Bourne compatible functions.
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
- # Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
-}
-
-# func_basename file
-func_basename ()
-{
- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
-
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
- case ${2} in
- .*) func_stripname_result=`$ECHO "X${3}" \
- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "X${3}" \
- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
- esac
-}
-
-# sed scripts:
-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[^=]*=//'
-
-# func_opt_split
-func_opt_split ()
-{
- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
- func_arith_result=`expr "$@"`
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
-
-_LT_EOF
-esac
-
-case $lt_shell_append in
- yes)
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
- eval "$1+=\$2"
-}
-_LT_EOF
- ;;
- *)
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
- eval "$1=\$$1\$2"
-}
-
-_LT_EOF
- ;;
- esac
+ sed '$q' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
+ if test x"$xsi_shell" = xyes; then
+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
+func_dirname ()\
+{\
+\ case ${1} in\
+\ */*) func_dirname_result="${1%/*}${2}" ;;\
+\ * ) func_dirname_result="${3}" ;;\
+\ esac\
+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
+func_basename ()\
+{\
+\ func_basename_result="${1##*/}"\
+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
+func_dirname_and_basename ()\
+{\
+\ case ${1} in\
+\ */*) func_dirname_result="${1%/*}${2}" ;;\
+\ * ) func_dirname_result="${3}" ;;\
+\ esac\
+\ func_basename_result="${1##*/}"\
+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
+func_stripname ()\
+{\
+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
+\ # positional parameters, so assign one to ordinary parameter first.\
+\ func_stripname_result=${3}\
+\ func_stripname_result=${func_stripname_result#"${1}"}\
+\ func_stripname_result=${func_stripname_result%"${2}"}\
+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
+func_split_long_opt ()\
+{\
+\ func_split_long_opt_name=${1%%=*}\
+\ func_split_long_opt_arg=${1#*=}\
+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
+func_split_short_opt ()\
+{\
+\ func_split_short_opt_arg=${1#??}\
+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
+func_lo2o ()\
+{\
+\ case ${1} in\
+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
+\ *) func_lo2o_result=${1} ;;\
+\ esac\
+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
+func_xform ()\
+{\
+ func_xform_result=${1%.*}.lo\
+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
+func_arith ()\
+{\
+ func_arith_result=$(( $* ))\
+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ sed -e '/^func_len ()$/,/^} # func_len /c\
+func_len ()\
+{\
+ func_len_result=${#1}\
+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+fi
+
+if test x"$lt_shell_append" = xyes; then
+ sed -e '/^func_append ()$/,/^} # func_append /c\
+func_append ()\
+{\
+ eval "${1}+=\\${2}"\
+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
+func_append_quoted ()\
+{\
+\ func_quote_for_eval "${2}"\
+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ # Save a `func_append' function call where possible by direct use of '+='
+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+ test 0 -eq $? || _lt_function_replace_fail=:
+else
+ # Save a `func_append' function call even when '+=' is not available
+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+ test 0 -eq $? || _lt_function_replace_fail=:
+fi
+
+if test x"$_lt_function_replace_fail" = x":"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
+fi
- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
- || (rm -f "$cfgfile"; exit 1)
- mv -f "$cfgfile" "$ofile" ||
+ mv -f "$cfgfile" "$ofile" ||
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
diff -pruN 3.0.0-2/configure.ac 3.0.1-0ubuntu1/configure.ac
--- 3.0.0-2/configure.ac 2011-04-04 08:21:33.000000000 +0000
+++ 3.0.1-0ubuntu1/configure.ac 2012-02-16 05:03:12.000000000 +0000
@@ -1,6 +1,6 @@
AC_PREREQ([2.64])
AC_INIT([GNOME Nettool],
- [3.0.0],
+ [3.0.1],
[http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-nettool],
[gnome-nettool],
[http://projects.gnome.org/gnome-network/]) #FIXME: website should be updated, it is even yet named gnome-network
@@ -35,6 +35,7 @@ GTK_REQUIRED=2.90.4
PKG_CHECK_MODULES(NETTOOL,
gtk+-3.0 >= $GTK_REQUIRED
+ launchpad-integration-3.0
gio-2.0 >= $GIO_REQUIRED
gmodule-export-2.0
gnome-doc-utils
diff -pruN 3.0.0-2/data/gnome-nettool.desktop.in.in 3.0.1-0ubuntu1/data/gnome-nettool.desktop.in.in
--- 3.0.0-2/data/gnome-nettool.desktop.in.in 2010-12-02 09:26:14.000000000 +0000
+++ 3.0.1-0ubuntu1/data/gnome-nettool.desktop.in.in 2012-02-16 05:03:12.000000000 +0000
@@ -5,7 +5,7 @@ Exec=gnome-nettool
Icon=gnome-nettool
Terminal=false
Type=Application
-Categories=System;Utility;GNOME;GTK;
+Categories=System;Settings;GNOME;GTK;
StartupNotify=true
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-nettool
diff -pruN 3.0.0-2/data/gnome-nettool.ui 3.0.1-0ubuntu1/data/gnome-nettool.ui
--- 3.0.0-2/data/gnome-nettool.ui 2012-02-16 05:03:13.000000000 +0000
+++ 3.0.1-0ubuntu1/data/gnome-nettool.ui 2012-02-16 05:03:12.000000000 +0000
@@ -123,8 +123,8 @@
</object>
</child>
<child>
- <object class="GtkAction" id="help1">
- <property name="name">help1</property>
+ <object class="GtkAction" id="help">
+ <property name="name">help</property>
<property name="label" translatable="yes">_Help</property>
</object>
</child>
@@ -134,6 +134,7 @@
<property name="name">m_help_contents</property>
<signal handler="on_help_activate" name="activate" object="main_window"/>
</object>
+ <accelerator key="F1" modifiers=""/>
</child>
<child>
<object class="GtkAction" id="m_about">
@@ -156,8 +157,9 @@
<separator/>
<menuitem action="m_clear_history"/>
</menu>
- <menu action="help1">
+ <menu action="help">
<menuitem action="m_help_contents"/>
+ <placeholder name="LaunchpadItems"/>
<menuitem action="m_about"/>
</menu>
</menubar>
@@ -281,6 +283,7 @@
<property name="left_padding">12</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow8">
+ <property name="height_request">120</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="border_width">6</property>
@@ -289,7 +292,6 @@
<property name="shadow_type">GTK_SHADOW_IN</property>
<child>
<object class="GtkTreeView" id="info_list_ip_addr">
- <property name="height_request">120</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="rules_hint">True</property>
@@ -836,12 +838,12 @@
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <object class="GtkVBox" id="vbox18">
+ <object class="GtkVBox" id="vbox_ping_top">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">12</property>
<child>
- <object class="GtkTable" id="table6">
+ <object class="GtkTable" id="table_ping_options">
<property name="visible">True</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
@@ -898,6 +900,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
<child>
@@ -922,7 +925,7 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -976,7 +979,7 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -1000,7 +1003,7 @@
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox2">
+ <object class="GtkHButtonBox" id="hbuttonbox_ping_button">
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
@@ -1044,23 +1047,31 @@
</object>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
<packing>
<property name="position">1</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox35">
+ <object class="GtkHBox" id="hbox_ping_details">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <object class="GtkFrame" id="frame8">
+ <object class="GtkFrame" id="frame_rtt_stats">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
@@ -1234,10 +1245,11 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame9">
+ <object class="GtkFrame" id="frame_transmission_stats">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
@@ -1368,6 +1380,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -1375,23 +1388,27 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkDrawingArea" id="ping_graph">
+ <property name="height_request">160</property>
<property name="visible">True</property>
</object>
<packing>
- <property name="position">3</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
- <object class="GtkExpander" id="expander1">
+ <object class="GtkExpander" id="expander_ping">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow">
+ <property name="height_request">160</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="border_width">6</property>
@@ -1416,9 +1433,10 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="pack_type">GTK_PACK_END</property>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
@@ -1443,6 +1461,7 @@
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">12</property>
+ <property name="expand">False</property>
<child>
<object class="GtkHBox" id="hbox43">
<property name="visible">True</property>
@@ -1513,7 +1532,10 @@
</child>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="padding">4</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -1561,9 +1583,16 @@
</object>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -1598,6 +1627,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -1749,6 +1780,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -1907,6 +1940,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -1932,6 +1967,7 @@
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">12</property>
+ <property name="expand">False</property>
<child>
<object class="GtkTable" id="table7">
<property name="visible">True</property>
@@ -2063,9 +2099,16 @@
</object>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -2099,6 +2142,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -2124,6 +2169,7 @@
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">12</property>
+ <property name="expand">False</property>
<child>
<object class="GtkTable" id="table8">
<property name="visible">True</property>
@@ -2277,9 +2323,16 @@
</object>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -2314,6 +2367,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -2472,6 +2527,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
diff -pruN 3.0.0-2/data/Makefile.in 3.0.1-0ubuntu1/data/Makefile.in
--- 3.0.0-2/data/Makefile.in 2011-04-04 08:31:34.000000000 +0000
+++ 3.0.1-0ubuntu1/data/Makefile.in 2012-01-03 09:26:47.000000000 +0000
@@ -102,6 +102,7 @@ DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -139,6 +140,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
@@ -181,6 +183,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -214,7 +217,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff -pruN 3.0.0-2/debian/changelog 3.0.1-0ubuntu1/debian/changelog
--- 3.0.0-2/debian/changelog 2011-07-22 02:09:50.000000000 +0000
+++ 3.0.1-0ubuntu1/debian/changelog 2012-02-16 01:41:20.000000000 +0000
@@ -1,16 +1,54 @@
-gnome-nettool (3.0.0-2) unstable; urgency=low
+gnome-nettool (3.0.1-0ubuntu1) precise; urgency=low
+ * New upstream release
* debian/watch:
- - Switch to .bz2 tarballs.
- - Don't run uupdate.
- * Bump debhelper compatibility level to 8. Update Build-Depends accordingly.
+ - Update to use .xz source archive
+ * debian/patches/01_network-manager.patch:
+ * debian/patches/03_fix_ifaces.patch:
+ - Applied upstream
+
+ -- Robert Ancell <robert ancell canonical com> Thu, 16 Feb 2012 12:31:21 +1100
+
+gnome-nettool (3.0.0-0ubuntu4) precise; urgency=low
+
+ * debian/patches/03_use_tracepath.patch:
+ - Modify the patch to re-title the column headers (LP: #661753)
+
+ -- Matthew Fischer <matthew fischer canonical com> Sat, 17 Dec 2011 22:58:50 -0700
+
+gnome-nettool (3.0.0-0ubuntu3) precise; urgency=low
+
+ * No-change rebuild to drop spurious libsfgcc1 dependency on armhf.
+
+ -- Adam Conrad <adconrad ubuntu com> Fri, 02 Dec 2011 17:40:21 -0700
+
+gnome-nettool (3.0.0-0ubuntu2) oneiric; urgency=low
+
* debian/control.in:
- - Remove old Conflicts/Replaces against gnome-network which is no longer
- necessary.
- - Add Vcs-* fields.
- * Upload to unstable, remove check-dist.mk include.
+ - Build-Depend on GTK3 version of liblaunchpad-integration
+
+ -- Rodrigo Moya <rodrigo moya canonical com> Tue, 17 May 2011 10:40:13 +0200
+
+gnome-nettool (3.0.0-0ubuntu1) oneiric; urgency=low
+
+ * Rebase from Debian, remaining Ubuntu changes:
+ * debian/control:
+ - Build-Depend on dh-autoreconf, gnome-common and liblaunchpad-integration-3.0-dev
+ - Standards-Version is 3.9.2
+ - Depend on iputils-tracepath instead of tcptraceroute
+ * debian/patches/02_lpi.patch:
+ - Patch for Launchpad integration
+ * debian/patches/03_use_tracepath.patch:
+ - Use tracepath instead of tcptraceroute or traceroute
+ * debian/patches/04_menu_change.patch:
+ - Move from Utilities to Settings
+ * debian/rules:
+ - Include autoreconf.mk
+ - Don't include check-dist.mk, as it's used for uploading to experimental
+ * debian/watch:
+ - Allow downloading unstable releases
- -- Michael Biebl <biebl debian org> Fri, 22 Jul 2011 04:09:48 +0200
+ -- Rodrigo Moya <rodrigo moya canonical com> Mon, 16 May 2011 17:08:33 +0200
gnome-nettool (3.0.0-1) experimental; urgency=low
diff -pruN 3.0.0-2/debian/compat 3.0.1-0ubuntu1/debian/compat
--- 3.0.0-2/debian/compat 2011-07-22 02:02:10.000000000 +0000
+++ 3.0.1-0ubuntu1/debian/compat 2012-02-16 01:41:20.000000000 +0000
@@ -1 +1 @@
-8
+5
diff -pruN 3.0.0-2/debian/control 3.0.1-0ubuntu1/debian/control
--- 3.0.0-2/debian/control 2011-07-22 02:17:29.000000000 +0000
+++ 3.0.1-0ubuntu1/debian/control 2012-02-16 01:41:22.000000000 +0000
@@ -6,41 +6,46 @@
Source: gnome-nettool
Section: gnome
Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers lists alioth debian org>
+Maintainer: Ubuntu Desktop Team <ubuntu-desktop lists ubuntu com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers lists alioth debian org>
Build-Depends: autotools-dev,
cdbs (>= 0.4.41),
- debhelper (>= 8),
+ debhelper (>= 5),
dh-buildinfo,
+ dh-autoreconf,
+ gnome-common,
gnome-pkg-tools (>= 0.10),
intltool (>= 0.40.0),
libglib2.0-dev (>= 2.25.10),
libgtk-3-dev (>= 3.0.3),
libgtop2-dev,
gnome-doc-utils,
- docbook-xml
-Uploaders: Jordi Mallach <jordi debian org>, Josselin Mouette <joss debian org>, Michael Biebl <biebl debian org>
+ docbook-xml,
+ liblaunchpad-integration-3.0-dev
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers lists alioth debian org>, Jordi Mallach <jordi debian org>, Josselin Mouette <joss debian org>
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-nettool/ubuntu
Standards-Version: 3.9.2
Homepage: http://projects.gnome.org/gnome-network/
-Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-nettool
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-nettool
Package: gnome-nettool
Architecture: any
+Replaces: gnome-network (<= 1.99.5)
Depends: ${shlibs:Depends},
${misc:Depends},
dnsutils,
net-tools,
iputils-ping | ping,
- tcptraceroute,
+ iputils-tracepath,
whois
Suggests: gnome-system-tools
+Conflicts: gnome-network (<= 1.99.5)
Description: network information tool for GNOME
GNOME Nettool is a network information tool which provides user interfaces for
some of the most common command line network tools including:
* ifconfig
* ping
* netstat
- * traceroute
+ * tracepath
* port scanning
* DNS lookup
* finger
diff -pruN 3.0.0-2/debian/control.in 3.0.1-0ubuntu1/debian/control.in
--- 3.0.0-2/debian/control.in 2011-07-22 02:08:31.000000000 +0000
+++ 3.0.1-0ubuntu1/debian/control.in 2012-02-16 01:41:20.000000000 +0000
@@ -1,41 +1,46 @@
Source: gnome-nettool
Section: gnome
Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers lists alioth debian org>
+Maintainer: Ubuntu Desktop Team <ubuntu-desktop lists ubuntu com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers lists alioth debian org>
Build-Depends: autotools-dev,
cdbs (>= 0.4.41),
- debhelper (>= 8),
+ debhelper (>= 5),
dh-buildinfo,
+ dh-autoreconf,
+ gnome-common,
gnome-pkg-tools (>= 0.10),
intltool (>= 0.40.0),
libglib2.0-dev (>= 2.25.10),
libgtk-3-dev (>= 3.0.3),
libgtop2-dev,
gnome-doc-utils,
- docbook-xml
+ docbook-xml,
+ liblaunchpad-integration-3.0-dev
Uploaders: @GNOME_TEAM@
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-nettool/ubuntu
Standards-Version: 3.9.2
Homepage: http://projects.gnome.org/gnome-network/
-Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-nettool
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-nettool
Package: gnome-nettool
Architecture: any
+Replaces: gnome-network (<= 1.99.5)
Depends: ${shlibs:Depends},
${misc:Depends},
dnsutils,
net-tools,
iputils-ping | ping,
- tcptraceroute,
+ iputils-tracepath,
whois
Suggests: gnome-system-tools
+Conflicts: gnome-network (<= 1.99.5)
Description: network information tool for GNOME
GNOME Nettool is a network information tool which provides user interfaces for
some of the most common command line network tools including:
* ifconfig
* ping
* netstat
- * traceroute
+ * tracepath
* port scanning
* DNS lookup
* finger
diff -pruN 3.0.0-2/debian/patches/01_ping_icmp_req.patch 3.0.1-0ubuntu1/debian/patches/01_ping_icmp_req.patch
--- 3.0.0-2/debian/patches/01_ping_icmp_req.patch 2011-07-22 01:58:40.000000000 +0000
+++ 3.0.1-0ubuntu1/debian/patches/01_ping_icmp_req.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-From: Josselin Mouette <joss debian org>
-Date: Sat, 13 Nov 2010 13:53:12 +0100
-Subject: [PATCH] [ping] Handle output with icmp_req
-
-iputils-ping displays icmp_req= instead of icmp_seq=. Handle the two
-outputs correctly.
-diff -uNr gnome-nettool-3.0.0.orig/src/ping.c gnome-nettool-3.0.0.ping/src/ping.c
---- gnome-nettool-3.0.0.orig/src/ping.c 2011-01-11 05:32:42.000000000 -0500
-+++ gnome-nettool-3.0.0.ping/src/ping.c 2011-04-15 14:12:59.785027195 -0400
-@@ -408,7 +408,7 @@
-
- if (len > 0) { /* there are data to show */
- count = strip_line (line, &data, netinfo);
-- if ((count == 5) || (count == 6)) {
-+ if ((count == 5) || (count == 7)) {
-
- /* Creation of GtkTreeView */
- gtk_tree_view_set_rules_hint (GTK_TREE_VIEW
-@@ -522,6 +522,7 @@
- strip_line (gchar * line, ping_data * data, Netinfo * netinfo)
- {
- gint count;
-+ gchar dummy_buf[3];
-
- if (netinfo_get_ip_version (netinfo) == IPV4)
- line = g_strdelimit (line, ":", ' ');
-@@ -533,9 +534,9 @@
- &(data)->bytes, data->ip, &(data)->icmp_seq,
- data->srtt, data->unit);
- #endif
--#ifdef PING_PARAMS_6
-+#ifdef PING_PARAMS_7
- count = sscanf (line, PING_FORMAT,
-- &(data)->bytes, data->ip, &(data)->icmp_seq,
-+ &(data)->bytes, data->ip, dummy_buf, &(data)->icmp_seq,
- &(data)->ttl, data->srtt, data->unit);
- #endif
- if (count != 5 && count != 6) {
-diff -uNr gnome-nettool-3.0.0.orig/src/ping.h gnome-nettool-3.0.0.ping/src/ping.h
---- gnome-nettool-3.0.0.orig/src/ping.h 2011-01-11 05:32:42.000000000 -0500
-+++ gnome-nettool-3.0.0.ping/src/ping.h 2011-04-15 14:13:03.297024821 -0400
-@@ -28,14 +28,14 @@
- /* <path to program> ping -b [-c <count>] -n <host> */
- # define PING_PROGRAM_FORMAT "%s ping -b%s-n %s"
- # define PING_PROGRAM_FORMAT_6 "%s ping6%s-n %s"
--# define PING_FORMAT "%d bytes from %s icmp_seq=%d ttl=%d time=%s %s"
--# define PING_PARAMS_6
-+# define PING_FORMAT "%d bytes from %s icmp_%3c=%d ttl=%d time=%s %s"
-+# define PING_PARAMS_7
- #elif defined(__OSF__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- /* <path to program> ping [-c <count>] -n <host> */
- # define PING_PROGRAM_FORMAT "%s ping%s-n %s"
- # define PING_PROGRAM_FORMAT_6 "%s ping6%s-n %s"
--# define PING_FORMAT "%d bytes from %s icmp_seq=%d ttl=%d time=%s %s"
--# define PING_PARAMS_6
-+# define PING_FORMAT "%d bytes from %s icmp_%3c=%d ttl=%d time=%s %s"
-+# define PING_PARAMS_7
- #elif defined(__sun__)
- /* <path to program> ping -s -n <host> [<count>] */
- # define PING_PROGRAM_FORMAT "%s ping -s -n %s 56%s"
diff -pruN 3.0.0-2/debian/patches/02_fix_ui.patch 3.0.1-0ubuntu1/debian/patches/02_fix_ui.patch
--- 3.0.0-2/debian/patches/02_fix_ui.patch 2011-07-22 01:58:40.000000000 +0000
+++ 3.0.1-0ubuntu1/debian/patches/02_fix_ui.patch 2012-02-16 01:41:20.000000000 +0000
@@ -1,29 +1,30 @@
Description: GtkCombo of the address for traceroute, port scan, and whois should not extend
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=647895
-diff -uNr gnome-nettool-3.0.0.orig/data/gnome-nettool.ui gnome-nettool-3.0.0.ui/data/gnome-nettool.ui
---- gnome-nettool-3.0.0.orig/data/gnome-nettool.ui 2011-01-11 05:32:42.000000000 -0500
-+++ gnome-nettool-3.0.0.ui/data/gnome-nettool.ui 2011-04-15 14:12:33.681024859 -0400
-@@ -1623,6 +1623,7 @@
+Index: gnome-nettool-3.0.1/data/gnome-nettool.ui
+===================================================================
+--- gnome-nettool-3.0.1.orig/data/gnome-nettool.ui 2012-02-16 12:39:22.388207614 +1100
++++ gnome-nettool-3.0.1/data/gnome-nettool.ui 2012-02-16 12:39:26.280207480 +1100
+@@ -1461,6 +1461,7 @@
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">12</property>
+ <property name="expand">False</property>
<child>
- <object class="GtkHBox" id="hbox36">
+ <object class="GtkHBox" id="hbox43">
<property name="visible">True</property>
-@@ -1775,6 +1776,7 @@
+@@ -1966,6 +1967,7 @@
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">12</property>
+ <property name="expand">False</property>
<child>
- <object class="GtkHBox" id="hbox37">
+ <object class="GtkTable" id="table7">
<property name="visible">True</property>
-@@ -2337,6 +2339,7 @@
+@@ -2167,6 +2169,7 @@
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">12</property>
+ <property name="expand">False</property>
<child>
- <object class="GtkHBox" id="hbox38">
+ <object class="GtkTable" id="table8">
<property name="visible">True</property>
diff -pruN 3.0.0-2/debian/patches/02_lpi.patch 3.0.1-0ubuntu1/debian/patches/02_lpi.patch
--- 3.0.0-2/debian/patches/02_lpi.patch 1970-01-01 00:00:00.000000000 +0000
+++ 3.0.1-0ubuntu1/debian/patches/02_lpi.patch 2012-02-16 01:41:20.000000000 +0000
@@ -0,0 +1,57 @@
+Description: Add Launchpad integration
+Author: ?
+
+Index: gnome-nettool-3.0.1/configure.ac
+===================================================================
+--- gnome-nettool-3.0.1.orig/configure.ac 2012-01-03 20:11:09.000000000 +1100
++++ gnome-nettool-3.0.1/configure.ac 2012-02-16 12:39:22.384207615 +1100
+@@ -35,6 +35,7 @@
+
+ PKG_CHECK_MODULES(NETTOOL,
+ gtk+-3.0 >= $GTK_REQUIRED
++ launchpad-integration-3.0
+ gio-2.0 >= $GIO_REQUIRED
+ gmodule-export-2.0
+ gnome-doc-utils
+Index: gnome-nettool-3.0.1/src/main.c
+===================================================================
+--- gnome-nettool-3.0.1.orig/src/main.c 2012-01-03 20:10:16.000000000 +1100
++++ gnome-nettool-3.0.1/src/main.c 2012-02-16 12:39:22.384207615 +1100
+@@ -24,6 +24,7 @@
+
+ #include <string.h>
+ #include <glib/gi18n.h>
++#include <launchpad-integration.h>
+
+ #include <glibtop.h>
+
+@@ -57,6 +58,7 @@
+ GtkBuilder *builder;
+ GtkWidget *notebook;
+ GtkWidget *statusbar;
++ GtkUIManager *ui;
+ const gchar *dialog = UI_DIR "gnome-nettool.ui";
+ Netinfo *pinger;
+ Netinfo *tracer;
+@@ -218,6 +220,9 @@
+ g_object_set_data (G_OBJECT (notebook), "whois", whois);
+
+ menu_beep = GTK_ACTION (gtk_builder_get_object (builder, "m_beep"));
++ ui = GTK_UI_MANAGER (gtk_builder_get_object (builder, "uimanager1"));
++ g_object_ref (ui);
++ launchpad_integration_add_ui (ui, "/ui/menubar1/help1/LaunchpadItems");
+
+ g_signal_connect (G_OBJECT (menu_beep), "activate",
+ G_CALLBACK (on_beep_activate),
+Index: gnome-nettool-3.0.1/data/gnome-nettool.ui
+===================================================================
+--- gnome-nettool-3.0.1.orig/data/gnome-nettool.ui 2012-01-03 20:10:16.000000000 +1100
++++ gnome-nettool-3.0.1/data/gnome-nettool.ui 2012-02-16 12:39:22.388207614 +1100
+@@ -159,6 +159,7 @@
+ </menu>
+ <menu action="help">
+ <menuitem action="m_help_contents"/>
++ <placeholder name="LaunchpadItems"/>
+ <menuitem action="m_about"/>
+ </menu>
+ </menubar>
diff -pruN 3.0.0-2/debian/patches/03_fix_ifaces.patch 3.0.1-0ubuntu1/debian/patches/03_fix_ifaces.patch
--- 3.0.0-2/debian/patches/03_fix_ifaces.patch 2011-07-22 01:58:40.000000000 +0000
+++ 3.0.1-0ubuntu1/debian/patches/03_fix_ifaces.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-Description: g_object_unref prevent interface name and pixmap to be displayed
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=647896
-diff -uNr gnome-nettool-3.0.0.orig/src/info.c gnome-nettool-3.0.0.ifaces/src/info.c
---- gnome-nettool-3.0.0.orig/src/info.c 2010-12-02 04:26:14.000000000 -0500
-+++ gnome-nettool-3.0.0.ifaces/src/info.c 2011-04-15 14:12:46.953026917 -0400
-@@ -200,13 +198,13 @@
- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (info->combo), renderer, TRUE);
- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (info->combo), renderer,
- "pixbuf", 0, NULL);
-- g_object_unref (renderer);
-+ /* g_object_unref (renderer); */
-
- renderer = gtk_cell_renderer_text_new ();
- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (info->combo), renderer, TRUE);
- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (info->combo), renderer,
- "markup", 1, NULL);
-- g_object_unref (renderer);
-+ /* g_object_unref (renderer); */
-
- gtk_combo_box_set_active (GTK_COMBO_BOX (info->combo), 0);
- }
diff -pruN 3.0.0-2/debian/patches/03_use_tracepath.patch 3.0.1-0ubuntu1/debian/patches/03_use_tracepath.patch
--- 3.0.0-2/debian/patches/03_use_tracepath.patch 1970-01-01 00:00:00.000000000 +0000
+++ 3.0.1-0ubuntu1/debian/patches/03_use_tracepath.patch 2012-02-16 01:41:20.000000000 +0000
@@ -0,0 +1,107 @@
+Description: Use tracepath instead of tcptraceroute or traceroute
+Author: ?
+
+Index: gnome-nettool-3.0.1/src/traceroute.c
+===================================================================
+--- gnome-nettool-3.0.1.orig/src/traceroute.c 2012-01-03 20:10:16.000000000 +1100
++++ gnome-nettool-3.0.1/src/traceroute.c 2012-02-16 12:39:29.248207377 +1100
+@@ -75,20 +75,16 @@
+ switch (netinfo_get_ip_version (netinfo))
+ {
+ case IPV4:
+- program = util_find_program_in_path ("tcptraceroute", NULL);
++
+ #ifdef DEBUG
+- g_print ("tcptraceroute: %s\n", program);
++ g_print ("tracepath: %s\n", program);
+ #endif /* DEBUG */
+- if (program != NULL) {
+- program_name = g_strdup ("tcptraceroute");
+- } else {
+- program = util_find_program_dialog ("traceroute", parent);
+- program_name = g_strdup ("traceroute");
+- }
++ program = util_find_program_dialog ("tracepath", parent);
++ program_name = g_strdup ("tracepath");
+ break;
+ case IPV6:
+- program = util_find_program_in_path ("traceroute6", NULL);
+- program_name = g_strdup ("traceroute6");
++ program = util_find_program_in_path ("tracepath6", NULL);
++ program_name = g_strdup ("tracepath6");
+ break;
+ default:
+ program = NULL;
+@@ -97,8 +93,7 @@
+
+ if (program != NULL) {
+ command =
+- g_strdup_printf ("%s %s %s %s", program, program_name,
+- TCPTRACEROUTE_OPTIONS, host);
++ g_strdup_printf ("%s %s %s", program, program_name, host);
+
+ netinfo->command_line = g_strsplit (command, " ", -1);
+
+@@ -221,7 +216,7 @@
+
+ count = sscanf (line, TRACE_FORMAT,
+ &(data)->hop_count, data->hostname, data->ip,
+- data->rtt1, data->rtt2/*, data->rtt3*/);
++ data->rtt1/*, data->rtt2, data->rtt3*/);
+
+ if (count == TRACE_NUM_ARGS) {
+ return count;
+@@ -229,7 +224,7 @@
+
+ if (count == TRACE_NUM_ERR) {
+ g_sprintf (data->rtt1, "*");
+- g_sprintf (data->rtt2, "*");
++ //g_sprintf (data->rtt2, "*");
+ return TRACE_NUM_ARGS;
+ }
+ /* The last line is different, because it has a
+@@ -239,14 +234,14 @@
+
+ count = sscanf (line, TRACE_FORMAT_OPEN,
+ &(data)->hop_count, data->hostname, data->ip,
+- data->rtt1, data->rtt2/*, data->rtt3*/);
++ data->rtt1/*, data->rtt2, data->rtt3*/);
+
+ if (count == TRACE_NUM_ARGS) {
+ return count;
+ } else {
+ count = sscanf (line, TRACE_FORMAT_CLOSE,
+ &(data)->hop_count, data->hostname,
+- data->ip, data->rtt1, data->rtt2 /*,
++ data->ip, data->rtt1/*, data->rtt2,
+ data->rtt3*/);
+ }
+
+@@ -305,7 +300,7 @@
+ gtk_tree_view_column_new_with_attributes
+ (_("Time 2"), renderer, "text", TRACE_RTT2, NULL);
+ g_object_set (G_OBJECT (renderer), "xalign", 1.0, NULL);
+- gtk_tree_view_append_column (widget, column);
++ //gtk_tree_view_append_column (widget, column);
+
+ model = GTK_TREE_MODEL (gtk_list_store_new
+ (TRACE_NUM_COLUMNS,
+Index: gnome-nettool-3.0.1/src/traceroute.h
+===================================================================
+--- gnome-nettool-3.0.1.orig/src/traceroute.h 2012-01-03 20:10:16.000000000 +1100
++++ gnome-nettool-3.0.1/src/traceroute.h 2012-02-16 12:39:29.248207377 +1100
+@@ -20,12 +20,12 @@
+
+ #include "nettool.h"
+
+-#define TRACE_FORMAT "%d %s %s %s ms %s ms"
++#define TRACE_FORMAT "%d: %s %s %sms"
+ #define TRACE_FORMAT_CLOSE "%d %s %s [closed] %s ms %s ms"
+ #define TRACE_FORMAT_OPEN "%d %s %s [open] %s ms %s ms"
+ #define TRACE_SELECT_DEVICE "Selected device %s address %s port %d for outgoing packets"
+ #define TRACE_TRACE_PATH "Tracing the path to %s (146.83.195.14) on TCP port 80 %d hops max"
+-#define TRACE_NUM_ARGS 5
++#define TRACE_NUM_ARGS 4
+ #define TRACE_NUM_ERR 3
+
+ /* Try 40 hops maximum and send only 1 packet */
diff -pruN 3.0.0-2/debian/patches/04_menu_change.patch 3.0.1-0ubuntu1/debian/patches/04_menu_change.patch
--- 3.0.0-2/debian/patches/04_menu_change.patch 1970-01-01 00:00:00.000000000 +0000
+++ 3.0.1-0ubuntu1/debian/patches/04_menu_change.patch 2012-02-16 01:41:20.000000000 +0000
@@ -0,0 +1,16 @@
+Description: Move from Utilities to Settings
+Author: ?
+
+Index: gnome-nettool-2.31.6/data/gnome-nettool.desktop.in.in
+===================================================================
+--- gnome-nettool-2.31.6.orig/data/gnome-nettool.desktop.in.in 2010-07-02 06:40:09.000000000 +1000
++++ gnome-nettool-2.31.6/data/gnome-nettool.desktop.in.in 2010-08-17 16:55:08.640563002 +1000
+@@ -5,7 +5,7 @@
+ Icon=gnome-nettool
+ Terminal=false
+ Type=Application
+-Categories=System;Utility;GNOME;GTK;
++Categories=System;Settings;GNOME;GTK;
+ StartupNotify=true
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gnome-nettool
diff -pruN 3.0.0-2/debian/patches/series 3.0.1-0ubuntu1/debian/patches/series
--- 3.0.0-2/debian/patches/series 2011-07-22 01:58:40.000000000 +0000
+++ 3.0.1-0ubuntu1/debian/patches/series 2012-02-16 01:41:20.000000000 +0000
@@ -1,3 +1,4 @@
-01_ping_icmp_req.patch
+02_lpi.patch
02_fix_ui.patch
-03_fix_ifaces.patch
+03_use_tracepath.patch
+04_menu_change.patch
diff -pruN 3.0.0-2/debian/rules 3.0.1-0ubuntu1/debian/rules
--- 3.0.0-2/debian/rules 2011-07-22 02:09:08.000000000 +0000
+++ 3.0.1-0ubuntu1/debian/rules 2012-02-16 01:41:20.000000000 +0000
@@ -8,6 +8,7 @@ export DH_ALWAYS_EXCLUDE=CVS:.svn
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
diff -pruN 3.0.0-2/debian/watch 3.0.1-0ubuntu1/debian/watch
--- 3.0.0-2/debian/watch 2011-07-22 02:00:34.000000000 +0000
+++ 3.0.1-0ubuntu1/debian/watch 2012-02-16 01:41:20.000000000 +0000
@@ -1,3 +1,4 @@
-version=3
-http://ftp.gnome.org/pub/GNOME/sources/gnome-nettool/([\d\.]+[02468])/ \
- gnome-nettool-(.*)\.tar\.bz2
+version=2
+http://ftp.gnome.org/pub/GNOME/sources/gnome-nettool/([\d\.]+)\d/ \
+ gnome-nettool-(.*)\.tar\.xz \
+ debian uupdate
diff -pruN 3.0.0-2/gnome-doc-utils.make 3.0.1-0ubuntu1/gnome-doc-utils.make
--- 3.0.0-2/gnome-doc-utils.make 2011-04-04 08:31:25.000000000 +0000
+++ 3.0.1-0ubuntu1/gnome-doc-utils.make 2012-01-03 09:26:44.000000000 +0000
@@ -361,7 +361,7 @@ $(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
## @ _DOC_POT
## A pot file
-_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot)
+_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot,$(if $(DOC_ID),$(DOC_ID).pot))
.PHONY: pot
pot: $(_DOC_POT)
$(_DOC_POT): $(_DOC_C_DOCS_NOENT)
diff -pruN 3.0.0-2/help/Makefile.in 3.0.1-0ubuntu1/help/Makefile.in
--- 3.0.0-2/help/Makefile.in 2011-04-04 08:31:34.000000000 +0000
+++ 3.0.1-0ubuntu1/help/Makefile.in 2012-01-03 09:26:47.000000000 +0000
@@ -102,6 +102,7 @@ DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -139,6 +140,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
@@ -181,6 +183,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -214,7 +217,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -328,7 +330,7 @@ _DOC_SRC_FIGURES = \
$(foreach fig,$(_DOC_C_FIGURES), $(foreach lc,C $(_DOC_REAL_LINGUAS), \
$(wildcard $(srcdir)/$(lc)/$(patsubst C/%,%,$(fig))) ))
-_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot)
+_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot,$(if $(DOC_ID),$(DOC_ID).pot))
################################################################################
_DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \
diff -pruN 3.0.0-2/ltmain.sh 3.0.1-0ubuntu1/ltmain.sh
--- 3.0.0-2/ltmain.sh 2011-04-04 08:31:24.000000000 +0000
+++ 3.0.1-0ubuntu1/ltmain.sh 2012-01-03 09:26:43.000000000 +0000
@@ -1,9 +1,9 @@
-# Generated from ltmain.m4sh.
-# ltmain.sh (GNU libtool) 2.2.6b
+# libtool (GNU libtool) 2.4
# Written by Gordon Matzigkeit <gord gnu ai mit edu>, 1996
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
# This is free software; see the source for copying conditions. There is NO
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -32,50 +32,56 @@
#
# Provide generalized library-building support services.
#
-# --config show all configuration variables
-# --debug enable verbose shell tracing
-# -n, --dry-run display commands without modifying any files
-# --features display basic configuration information and exit
-# --mode=MODE use operation mode MODE
-# --preserve-dup-deps don't remove duplicate dependency libraries
-# --quiet, --silent don't print informational messages
-# --tag=TAG use configuration variables from tag TAG
-# -v, --verbose print informational messages (default)
-# --version print version information
-# -h, --help print short or long help message
+# --config show all configuration variables
+# --debug enable verbose shell tracing
+# -n, --dry-run display commands without modifying any files
+# --features display basic configuration information and exit
+# --mode=MODE use operation mode MODE
+# --preserve-dup-deps don't remove duplicate dependency libraries
+# --quiet, --silent don't print informational messages
+# --no-quiet, --no-silent
+# print informational messages (default)
+# --tag=TAG use configuration variables from tag TAG
+# -v, --verbose print more informational messages than default
+# --no-verbose don't print the extra informational messages
+# --version print version information
+# -h, --help, --help-all print short, long, or detailed help message
#
# MODE must be one of the following:
#
-# clean remove files from the build directory
-# compile compile a source file into a libtool object
-# execute automatically set library path, then run a program
-# finish complete the installation of libtool libraries
-# install install libraries or executables
-# link create a library or an executable
-# uninstall remove libraries from an installed directory
+# clean remove files from the build directory
+# compile compile a source file into a libtool object
+# execute automatically set library path, then run a program
+# finish complete the installation of libtool libraries
+# install install libraries or executables
+# link create a library or an executable
+# uninstall remove libraries from an installed directory
#
-# MODE-ARGS vary depending on the MODE.
+# MODE-ARGS vary depending on the MODE. When passed as first option,
+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
#
# When reporting a bug, please describe a test case to reproduce it and
# include the following information:
#
-# host-triplet: $host
-# shell: $SHELL
-# compiler: $LTCC
-# compiler flags: $LTCFLAGS
-# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu3
-# automake: $automake_version
-# autoconf: $autoconf_version
+# host-triplet: $host
+# shell: $SHELL
+# compiler: $LTCC
+# compiler flags: $LTCFLAGS
+# linker: $LD (gnu? $with_gnu_ld)
+# $progname: (GNU libtool) 2.4 Debian-2.4-2ubuntu1
+# automake: $automake_version
+# autoconf: $autoconf_version
#
# Report bugs to <bug-libtool gnu org>.
+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+# General help using GNU software: <http://www.gnu.org/gethelp/>.
-PROGRAM=ltmain.sh
+PROGRAM=libtool
PACKAGE=libtool
-VERSION="2.2.6b Debian-2.2.6b-2ubuntu3"
+VERSION="2.4 Debian-2.4-2ubuntu1"
TIMESTAMP=""
-package_revision=1.3017
+package_revision=1.3293
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -91,10 +97,15 @@ fi
BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+ eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
# NLS nuisances: We save the old values to restore during execute mode.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
lt_user_locale=
lt_safe_locale=
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
@@ -107,15 +118,24 @@ do
lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
fi"
done
+LC_ALL=C
+LANGUAGE=C
+export LANGUAGE LC_ALL
$lt_unset CDPATH
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
: ${CP="cp -f"}
-: ${ECHO="echo"}
+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
: ${EGREP="/bin/grep -E"}
: ${FGREP="/bin/grep -F"}
: ${GREP="/bin/grep"}
@@ -144,6 +164,27 @@ IFS=" $lt_nl"
dirname="s,/[^/]*$,,"
basename="s,^.*/,,"
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+ if test "X$func_dirname_result" = "X${1}"; then
+ func_dirname_result="${3}"
+ else
+ func_dirname_result="$func_dirname_result${2}"
+ fi
+} # func_dirname may be replaced by extended shell implementation
+
+
+# func_basename file
+func_basename ()
+{
+ func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+} # func_basename may be replaced by extended shell implementation
+
+
# func_dirname_and_basename file append nondir_replacement
# perform func_basename and func_dirname in a single function
# call:
@@ -158,33 +199,183 @@ basename="s,^.*/,,"
# those functions but instead duplicate the functionality here.
func_dirname_and_basename ()
{
- # Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+ # Extract subdirectory from the argument.
+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
+ if test "X$func_dirname_result" = "X${1}"; then
+ func_dirname_result="${3}"
+ else
+ func_dirname_result="$func_dirname_result${2}"
+ fi
+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
+} # func_dirname_and_basename may be replaced by extended shell implementation
+
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+ case ${2} in
+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+ esac
+} # func_stripname may be replaced by extended shell implementation
+
+
+# These SED scripts presuppose an absolute path with a trailing slash.
+pathcar='s,^/\([^/]*\).*$,\1,'
+pathcdr='s,^/[^/]*,,'
+removedotparts=':dotsl
+ s@/\./@/@g
+ t dotsl
+ s,/\.$,/,'
+collapseslashes='s@/\{1,\}@/@g'
+finalslash='s,/*$,/,'
+
+# func_normal_abspath PATH
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+# value returned in "$func_normal_abspath_result"
+func_normal_abspath ()
+{
+ # Start from root dir and reassemble the path.
+ func_normal_abspath_result=
+ func_normal_abspath_tpath=$1
+ func_normal_abspath_altnamespace=
+ case $func_normal_abspath_tpath in
+ "")
+ # Empty path, that just means $cwd.
+ func_stripname '' '/' "`pwd`"
+ func_normal_abspath_result=$func_stripname_result
+ return
+ ;;
+ # The next three entries are used to spot a run of precisely
+ # two leading slashes without using negated character classes;
+ # we take advantage of case's first-match behaviour.
+ ///*)
+ # Unusual form of absolute path, do nothing.
+ ;;
+ //*)
+ # Not necessarily an ordinary path; POSIX reserves leading '//'
+ # and for example Cygwin uses it to access remote file shares
+ # over CIFS/SMB, so we conserve a leading double slash if found.
+ func_normal_abspath_altnamespace=/
+ ;;
+ /*)
+ # Absolute path, do nothing.
+ ;;
+ *)
+ # Relative path, prepend $cwd.
+ func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+ ;;
+ esac
+ # Cancel out all the simple stuff to save iterations. We also want
+ # the path to end with a slash for ease of parsing, so make sure
+ # there is one (and only one) here.
+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
+ while :; do
+ # Processed it all yet?
+ if test "$func_normal_abspath_tpath" = / ; then
+ # If we ascended to the root using ".." the result may be empty now.
+ if test -z "$func_normal_abspath_result" ; then
+ func_normal_abspath_result=/
+ fi
+ break
+ fi
+ func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$pathcar"`
+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$pathcdr"`
+ # Figure out what to do with it
+ case $func_normal_abspath_tcomponent in
+ "")
+ # Trailing empty path component, ignore it.
+ ;;
+ ..)
+ # Parent dir; strip last assembled component from result.
+ func_dirname "$func_normal_abspath_result"
+ func_normal_abspath_result=$func_dirname_result
+ ;;
+ *)
+ # Actual path component, append it.
+ func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
+ ;;
+ esac
+ done
+ # Restore leading double-slash if one was found on entry.
+ func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
}
-# Generated shell functions inserted here.
+# func_relative_path SRCDIR DSTDIR
+# generates a relative path from SRCDIR to DSTDIR, with a trailing
+# slash if non-empty, suitable for immediately appending a filename
+# without needing to append a separator.
+# value returned in "$func_relative_path_result"
+func_relative_path ()
+{
+ func_relative_path_result=
+ func_normal_abspath "$1"
+ func_relative_path_tlibdir=$func_normal_abspath_result
+ func_normal_abspath "$2"
+ func_relative_path_tbindir=$func_normal_abspath_result
+
+ # Ascend the tree starting from libdir
+ while :; do
+ # check if we have found a prefix of bindir
+ case $func_relative_path_tbindir in
+ $func_relative_path_tlibdir)
+ # found an exact match
+ func_relative_path_tcancelled=
+ break
+ ;;
+ $func_relative_path_tlibdir*)
+ # found a matching prefix
+ func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+ func_relative_path_tcancelled=$func_stripname_result
+ if test -z "$func_relative_path_result"; then
+ func_relative_path_result=.
+ fi
+ break
+ ;;
+ *)
+ func_dirname $func_relative_path_tlibdir
+ func_relative_path_tlibdir=${func_dirname_result}
+ if test "x$func_relative_path_tlibdir" = x ; then
+ # Have to descend all the way to the root!
+ func_relative_path_result=../$func_relative_path_result
+ func_relative_path_tcancelled=$func_relative_path_tbindir
+ break
+ fi
+ func_relative_path_result=../$func_relative_path_result
+ ;;
+ esac
+ done
+
+ # Now calculate path; take care to avoid doubling-up slashes.
+ func_stripname '' '/' "$func_relative_path_result"
+ func_relative_path_result=$func_stripname_result
+ func_stripname '/' '/' "$func_relative_path_tcancelled"
+ if test "x$func_stripname_result" != x ; then
+ func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
+ fi
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
+ # Normalisation. If bindir is libdir, return empty string,
+ # else relative path ending with a slash; either way, target
+ # file name can be directly appended.
+ if test ! -z "$func_relative_path_result"; then
+ func_stripname './' '' "$func_relative_path_result/"
+ func_relative_path_result=$func_stripname_result
+ fi
+}
# The name of this program:
-# In the unlikely event $progname began with a '-', it would play havoc with
-# func_echo (imagine progname=-n), so we prepend ./ in that case:
func_dirname_and_basename "$progpath"
progname=$func_basename_result
-case $progname in
- -*) progname=./$progname ;;
-esac
# Make sure we have an absolute path for reexecution:
case $progpath in
@@ -215,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
double_quote_subst='s/\(["`\\]\)/\\\1/g'
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
+
+# Sed substitution that converts a w32 file name or path
+# which contains forward slashes, into one that contains
+# (escaped) backslashes. A very naive implementation.
+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
# Re-`\' parameter expansions in output of double_quote_subst that were
# `\'-ed in input to the same. If an odd number of `\' preceded a '$'
# in input to double_quote_subst, that '$' was protected from expansion.
@@ -243,7 +443,7 @@ opt_warning=:
# name if it has been set yet.
func_echo ()
{
- $ECHO "$progname${mode+: }$mode: $*"
+ $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
}
# func_verbose arg...
@@ -258,18 +458,25 @@ func_verbose ()
:
}
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+ $ECHO "$*"
+}
+
# func_error arg...
# Echo program name prefixed message to standard error.
func_error ()
{
- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
+ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
}
# func_warning arg...
# Echo program name prefixed warning message to standard error.
func_warning ()
{
- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
+ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
# bash bug again:
:
@@ -326,9 +533,9 @@ func_mkdir_p ()
case $my_directory_path in */*) ;; *) break ;; esac
# ...otherwise throw away the child directory and loop
- my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
+ my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
done
- my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
+ my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
save_mkdir_p_IFS="$IFS"; IFS=':'
for my_dir in $my_dir_list; do
@@ -378,7 +585,7 @@ func_mktempdir ()
func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
fi
- $ECHO "X$my_tmpdir" | $Xsed
+ $ECHO "$my_tmpdir"
}
@@ -392,7 +599,7 @@ func_quote_for_eval ()
{
case $1 in
*[\\\`\"\$]*)
- func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
+ func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
*)
func_quote_for_eval_unquoted_result="$1" ;;
esac
@@ -419,7 +626,7 @@ func_quote_for_expand ()
{
case $1 in
*[\\\`\"]*)
- my_arg=`$ECHO "X$1" | $Xsed \
+ my_arg=`$ECHO "$1" | $SED \
-e "$double_quote_subst" -e "$sed_double_backslash"` ;;
*)
my_arg="$1" ;;
@@ -488,15 +695,39 @@ func_show_eval_locale ()
fi
}
-
-
+# func_tr_sh
+# Turn $1 into a string suitable for a shell variable name.
+# Result is stored in $func_tr_sh_result. All characters
+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
+# if $1 begins with a digit, a '_' is prepended as well.
+func_tr_sh ()
+{
+ case $1 in
+ [0-9]* | *[!a-zA-Z0-9_]*)
+ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
+ ;;
+ * )
+ func_tr_sh_result=$1
+ ;;
+ esac
+}
# func_version
# Echo version message to standard output and exit.
func_version ()
{
- $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
+ $opt_debug
+
+ $SED -n '/(C)/!b go
+ :more
+ /\./!{
+ N
+ s/\n# / /
+ b more
+ }
+ :go
+ /^# '$PROGRAM' (GNU /,/# warranty; / {
s/^# //
s/^# *$//
s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
@@ -509,22 +740,28 @@ func_version ()
# Echo short help message to standard output and exit.
func_usage ()
{
- $SED -n '/^# Usage:/,/# -h/ {
+ $opt_debug
+
+ $SED -n '/^# Usage:/,/^# *.*--help/ {
s/^# //
s/^# *$//
s/\$progname/'$progname'/
p
}' < "$progpath"
- $ECHO
+ echo
$ECHO "run \`$progname --help | more' for full usage"
exit $?
}
-# func_help
-# Echo long help message to standard output and exit.
+# func_help [NOEXIT]
+# Echo long help message to standard output and exit,
+# unless 'noexit' is passed as argument.
func_help ()
{
+ $opt_debug
+
$SED -n '/^# Usage:/,/# Report bugs to/ {
+ :print
s/^# //
s/^# *$//
s*\$progname*'$progname'*
@@ -537,8 +774,15 @@ func_help ()
s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
p
- }' < "$progpath"
- exit $?
+ d
+ }
+ /^# .* home page:/b print
+ /^# General help using/b print
+ ' < "$progpath"
+ ret=$?
+ if test -z "$1"; then
+ exit $ret
+ fi
}
# func_missing_arg argname
@@ -546,63 +790,106 @@ func_help ()
# exit_cmd.
func_missing_arg ()
{
- func_error "missing argument for $1"
+ $opt_debug
+
+ func_error "missing argument for $1."
exit_cmd=exit
}
-exit_cmd=:
+# func_split_short_opt shortopt
+# Set func_split_short_opt_name and func_split_short_opt_arg shell
+# variables after splitting SHORTOPT after the 2nd character.
+func_split_short_opt ()
+{
+ my_sed_short_opt='1s/^\(..\).*$/\1/;q'
+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
+
+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
+} # func_split_short_opt may be replaced by extended shell implementation
+
+
+# func_split_long_opt longopt
+# Set func_split_long_opt_name and func_split_long_opt_arg shell
+# variables after splitting LONGOPT at the `=' sign.
+func_split_long_opt ()
+{
+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
+ my_sed_long_arg='1s/^--[^=]*=//'
+
+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
+} # func_split_long_opt may be replaced by extended shell implementation
+exit_cmd=:
-# Check that we have a working $ECHO.
-if test "X$1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
-elif test "X$1" = X--fallback-echo; then
- # Avoid inline document here, it may be left over
- :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
- # Yippee, $ECHO works!
- :
-else
- # Restart under the correct shell, and then maybe $ECHO will work.
- exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
-if test "X$1" = X--fallback-echo; then
- # used as fallback echo
- shift
- cat <<EOF
-$*
-EOF
- exit $EXIT_SUCCESS
-fi
magic="%%%MAGIC variable%%%"
magic_exe="%%%MAGIC EXE variable%%%"
# Global variables.
-# $mode is unset
nonopt=
-execute_dlfiles=
preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
extracted_archives=
extracted_serial=0
-opt_dry_run=false
-opt_duplicate_deps=false
-opt_silent=false
-opt_debug=:
-
# If this variable is set in any of the actions, the command in it
# will be execed at the end. This prevents here-documents from being
# left over by shells.
exec_cmd=
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+ eval "${1}=\$${1}\${2}"
+} # func_append may be replaced by extended shell implementation
+
+# func_append_quoted var value
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+func_append_quoted ()
+{
+ func_quote_for_eval "${2}"
+ eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
+} # func_append_quoted may be replaced by extended shell implementation
+
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+ func_arith_result=`expr "${@}"`
+} # func_arith may be replaced by extended shell implementation
+
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
+} # func_len may be replaced by extended shell implementation
+
+
+# func_lo2o object
+func_lo2o ()
+{
+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
+} # func_lo2o may be replaced by extended shell implementation
+
+
+# func_xform libobj-or-source
+func_xform ()
+{
+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
+} # func_xform may be replaced by extended shell implementation
+
+
# func_fatal_configuration arg...
# Echo program name prefixed message to standard error, followed by
# a configuration failure hint, and exit.
@@ -636,16 +923,16 @@ func_config ()
# Display the features supported by this script.
func_features ()
{
- $ECHO "host: $host"
+ echo "host: $host"
if test "$build_libtool_libs" = yes; then
- $ECHO "enable shared libraries"
+ echo "enable shared libraries"
else
- $ECHO "disable shared libraries"
+ echo "disable shared libraries"
fi
if test "$build_old_libs" = yes; then
- $ECHO "enable static libraries"
+ echo "enable static libraries"
else
- $ECHO "disable static libraries"
+ echo "disable static libraries"
fi
exit $?
@@ -692,117 +979,204 @@ func_enable_tag ()
esac
}
-# Parse options once, thoroughly. This comes as soon as possible in
-# the script to make things like `libtool --version' happen quickly.
+# func_check_version_match
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
{
+ if test "$package_revision" != "$macro_revision"; then
+ if test "$VERSION" != "$macro_version"; then
+ if test -z "$macro_version"; then
+ cat >&2 <<_LT_EOF
+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+ else
+ cat >&2 <<_LT_EOF
+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+ fi
+ else
+ cat >&2 <<_LT_EOF
+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
+ fi
+
+ exit $EXIT_MISMATCH
+ fi
+}
+
+
+# Shorthand for --mode=foo, only valid as the first argument
+case $1 in
+clean|clea|cle|cl)
+ shift; set dummy --mode clean ${1+"$@"}; shift
+ ;;
+compile|compil|compi|comp|com|co|c)
+ shift; set dummy --mode compile ${1+"$@"}; shift
+ ;;
+execute|execut|execu|exec|exe|ex|e)
+ shift; set dummy --mode execute ${1+"$@"}; shift
+ ;;
+finish|finis|fini|fin|fi|f)
+ shift; set dummy --mode finish ${1+"$@"}; shift
+ ;;
+install|instal|insta|inst|ins|in|i)
+ shift; set dummy --mode install ${1+"$@"}; shift
+ ;;
+link|lin|li|l)
+ shift; set dummy --mode link ${1+"$@"}; shift
+ ;;
+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+ shift; set dummy --mode uninstall ${1+"$@"}; shift
+ ;;
+esac
- # Shorthand for --mode=foo, only valid as the first argument
- case $1 in
- clean|clea|cle|cl)
- shift; set dummy --mode clean ${1+"$@"}; shift
- ;;
- compile|compil|compi|comp|com|co|c)
- shift; set dummy --mode compile ${1+"$@"}; shift
- ;;
- execute|execut|execu|exec|exe|ex|e)
- shift; set dummy --mode execute ${1+"$@"}; shift
- ;;
- finish|finis|fini|fin|fi|f)
- shift; set dummy --mode finish ${1+"$@"}; shift
- ;;
- install|instal|insta|inst|ins|in|i)
- shift; set dummy --mode install ${1+"$@"}; shift
- ;;
- link|lin|li|l)
- shift; set dummy --mode link ${1+"$@"}; shift
- ;;
- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
- shift; set dummy --mode uninstall ${1+"$@"}; shift
- ;;
- esac
- # Parse non-mode specific arguments:
- while test "$#" -gt 0; do
+
+# Option defaults:
+opt_debug=:
+opt_dry_run=false
+opt_config=false
+opt_preserve_dup_deps=false
+opt_features=false
+opt_finish=false
+opt_help=false
+opt_help_all=false
+opt_silent=:
+opt_verbose=:
+opt_silent=false
+opt_verbose=false
+
+
+# Parse options once, thoroughly. This comes as soon as possible in the
+# script to make things like `--version' happen as quickly as we can.
+{
+ # this just eases exit handling
+ while test $# -gt 0; do
opt="$1"
shift
-
case $opt in
- --config) func_config ;;
-
- --debug) preserve_args="$preserve_args $opt"
+ --debug|-x) opt_debug='set -x'
func_echo "enabling shell trace mode"
- opt_debug='set -x'
$opt_debug
;;
-
- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
- execute_dlfiles="$execute_dlfiles $1"
- shift
+ --dry-run|--dryrun|-n)
+ opt_dry_run=:
;;
-
- --dry-run | -n) opt_dry_run=: ;;
- --features) func_features ;;
- --finish) mode="finish" ;;
-
- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
- case $1 in
- # Valid mode arguments:
- clean) ;;
- compile) ;;
- execute) ;;
- finish) ;;
- install) ;;
- link) ;;
- relink) ;;
- uninstall) ;;
-
- # Catch anything else as an error
- *) func_error "invalid argument for $opt"
- exit_cmd=exit
- break
- ;;
- esac
-
- mode="$1"
+ --config)
+ opt_config=:
+func_config
+ ;;
+ --dlopen|-dlopen)
+ optarg="$1"
+ opt_dlopen="${opt_dlopen+$opt_dlopen
+}$optarg"
shift
;;
-
--preserve-dup-deps)
- opt_duplicate_deps=: ;;
-
- --quiet|--silent) preserve_args="$preserve_args $opt"
- opt_silent=:
+ opt_preserve_dup_deps=:
;;
-
- --verbose| -v) preserve_args="$preserve_args $opt"
+ --features)
+ opt_features=:
+func_features
+ ;;
+ --finish)
+ opt_finish=:
+set dummy --mode finish ${1+"$@"}; shift
+ ;;
+ --help)
+ opt_help=:
+ ;;
+ --help-all)
+ opt_help_all=:
+opt_help=': help-all'
+ ;;
+ --mode)
+ test $# = 0 && func_missing_arg $opt && break
+ optarg="$1"
+ opt_mode="$optarg"
+case $optarg in
+ # Valid mode arguments:
+ clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+ # Catch anything else as an error
+ *) func_error "invalid argument for $opt"
+ exit_cmd=exit
+ break
+ ;;
+esac
+ shift
+ ;;
+ --no-silent|--no-quiet)
opt_silent=false
+func_append preserve_args " $opt"
;;
-
- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
- preserve_args="$preserve_args $opt $1"
- func_enable_tag "$1" # tagname is set here
+ --no-verbose)
+ opt_verbose=false
+func_append preserve_args " $opt"
+ ;;
+ --silent|--quiet)
+ opt_silent=:
+func_append preserve_args " $opt"
+ opt_verbose=false
+ ;;
+ --verbose|-v)
+ opt_verbose=:
+func_append preserve_args " $opt"
+opt_silent=false
+ ;;
+ --tag)
+ test $# = 0 && func_missing_arg $opt && break
+ optarg="$1"
+ opt_tag="$optarg"
+func_append preserve_args " $opt $optarg"
+func_enable_tag "$optarg"
shift
;;
+ -\?|-h) func_usage ;;
+ --help) func_help ;;
+ --version) func_version ;;
+
# Separate optargs to long options:
- -dlopen=*|--mode=*|--tag=*)
- func_opt_split "$opt"
- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
+ --*=*)
+ func_split_long_opt "$opt"
+ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
shift
;;
- -\?|-h) func_usage ;;
- --help) opt_help=: ;;
- --version) func_version ;;
-
- -*) func_fatal_help "unrecognized option \`$opt'" ;;
-
- *) nonopt="$opt"
- break
+ # Separate non-argument short options:
+ -\?*|-h*|-n*|-v*)
+ func_split_short_opt "$opt"
+ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
+ shift
;;
+
+ --) break ;;
+ -*) func_fatal_help "unrecognized option \`$opt'" ;;
+ *) set dummy "$opt" ${1+"$@"}; shift; break ;;
esac
done
+ # Validate options:
+
+ # save first non-option argument
+ if test "$#" -gt 0; then
+ nonopt="$opt"
+ shift
+ fi
+
+ # preserve --debug
+ test "$opt_debug" = : || func_append preserve_args " --debug"
case $host in
*cygwin* | *mingw* | *pw32* | *cegcc*)
@@ -810,82 +1184,44 @@ func_enable_tag ()
opt_duplicate_compiler_generated_deps=:
;;
*)
- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
;;
esac
- # Having warned about all mis-specified options, bail out if
- # anything was wrong.
- $exit_cmd $EXIT_FAILURE
-}
+ $opt_help || {
+ # Sanity checks first:
+ func_check_version_match
-# func_check_version_match
-# Ensure that we are using m4 macros, and libtool script from the same
-# release of libtool.
-func_check_version_match ()
-{
- if test "$package_revision" != "$macro_revision"; then
- if test "$VERSION" != "$macro_version"; then
- if test -z "$macro_version"; then
- cat >&2 <<_LT_EOF
-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from an older release.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
- else
- cat >&2 <<_LT_EOF
-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
- fi
- else
- cat >&2 <<_LT_EOF
-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-$progname: of $PACKAGE $VERSION and run autoconf again.
-_LT_EOF
+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+ func_fatal_configuration "not configured to build any kind of library"
fi
- exit $EXIT_MISMATCH
- fi
-}
-
+ # Darwin sucks
+ eval std_shrext=\"$shrext_cmds\"
-## ----------- ##
-## Main. ##
-## ----------- ##
-
-$opt_help || {
- # Sanity checks first:
- func_check_version_match
-
- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
- func_fatal_configuration "not configured to build any kind of library"
- fi
+ # Only execute mode is allowed to have -dlopen flags.
+ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
+ func_error "unrecognized option \`-dlopen'"
+ $ECHO "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
- test -z "$mode" && func_fatal_error "error: you must specify a MODE."
+ # Change the help message to a mode-specific one.
+ generic_help="$help"
+ help="Try \`$progname --help --mode=$opt_mode' for more information."
+ }
- # Darwin sucks
- eval std_shrext=\"$shrext_cmds\"
+ # Bail if the options were screwed
+ $exit_cmd $EXIT_FAILURE
+}
- # Only execute mode is allowed to have -dlopen flags.
- if test -n "$execute_dlfiles" && test "$mode" != execute; then
- func_error "unrecognized option \`-dlopen'"
- $ECHO "$help" 1>&2
- exit $EXIT_FAILURE
- fi
- # Change the help message to a mode-specific one.
- generic_help="$help"
- help="Try \`$progname --help --mode=$mode' for more information."
-}
+## ----------- ##
+## Main. ##
+## ----------- ##
# func_lalib_p file
# True iff FILE is a libtool `.la' library or `.lo' object file.
@@ -950,12 +1286,9 @@ func_ltwrapper_executable_p ()
# temporary ltwrapper_script.
func_ltwrapper_scriptname ()
{
- func_ltwrapper_scriptname_result=""
- if func_ltwrapper_executable_p "$1"; then
- func_dirname_and_basename "$1" "" "."
- func_stripname '' '.exe' "$func_basename_result"
- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
- fi
+ func_dirname_and_basename "$1" "" "."
+ func_stripname '' '.exe' "$func_basename_result"
+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
}
# func_ltwrapper_p file
@@ -1001,6 +1334,37 @@ func_source ()
}
+# func_resolve_sysroot PATH
+# Replace a leading = in PATH with a sysroot. Store the result into
+# func_resolve_sysroot_result
+func_resolve_sysroot ()
+{
+ func_resolve_sysroot_result=$1
+ case $func_resolve_sysroot_result in
+ =*)
+ func_stripname '=' '' "$func_resolve_sysroot_result"
+ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
+ ;;
+ esac
+}
+
+# func_replace_sysroot PATH
+# If PATH begins with the sysroot, replace it with = and
+# store the result into func_replace_sysroot_result.
+func_replace_sysroot ()
+{
+ case "$lt_sysroot:$1" in
+ ?*:"$lt_sysroot"*)
+ func_stripname "$lt_sysroot" '' "$1"
+ func_replace_sysroot_result="=$func_stripname_result"
+ ;;
+ *)
+ # Including no sysroot.
+ func_replace_sysroot_result=$1
+ ;;
+ esac
+}
+
# func_infer_tag arg
# Infer tagged configuration to use if any are available and
# if one wasn't chosen via the "--tag" command line option.
@@ -1013,13 +1377,15 @@ func_infer_tag ()
if test -n "$available_tags" && test -z "$tagname"; then
CC_quoted=
for arg in $CC; do
- func_quote_for_eval "$arg"
- CC_quoted="$CC_quoted $func_quote_for_eval_result"
+ func_append_quoted CC_quoted "$arg"
done
+ CC_expanded=`func_echo_all $CC`
+ CC_quoted_expanded=`func_echo_all $CC_quoted`
case $@ in
# Blanks in the command may have been stripped by the calling shell,
# but not from the CC environment variable when configure was run.
- " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
+ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
# Blanks at the start of $base_compile will cause this to fail
# if we don't check for them as well.
*)
@@ -1030,11 +1396,13 @@ func_infer_tag ()
CC_quoted=
for arg in $CC; do
# Double-quote args containing other shell metacharacters.
- func_quote_for_eval "$arg"
- CC_quoted="$CC_quoted $func_quote_for_eval_result"
+ func_append_quoted CC_quoted "$arg"
done
+ CC_expanded=`func_echo_all $CC`
+ CC_quoted_expanded=`func_echo_all $CC_quoted`
case "$@ " in
- " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
+ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
# The compiler in the base compile command matches
# the one in the tagged configuration.
# Assume this is the tagged configuration we want.
@@ -1097,6 +1465,486 @@ EOF
}
}
+
+##################################################
+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
+##################################################
+
+# func_convert_core_file_wine_to_w32 ARG
+# Helper function used by file name conversion functions when $build is *nix,
+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
+# correctly configured wine environment available, with the winepath program
+# in $build's $PATH.
+#
+# ARG is the $build file name to be converted to w32 format.
+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
+# be empty on error (or when ARG is empty)
+func_convert_core_file_wine_to_w32 ()
+{
+ $opt_debug
+ func_convert_core_file_wine_to_w32_result="$1"
+ if test -n "$1"; then
+ # Unfortunately, winepath does not exit with a non-zero error code, so we
+ # are forced to check the contents of stdout. On the other hand, if the
+ # command is not found, the shell will set an exit code of 127 and print
+ # *an error message* to stdout. So we must check for both error code of
+ # zero AND non-empty stdout, which explains the odd construction:
+ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
+ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
+ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
+ $SED -e "$lt_sed_naive_backslashify"`
+ else
+ func_convert_core_file_wine_to_w32_result=
+ fi
+ fi
+}
+# end: func_convert_core_file_wine_to_w32
+
+
+# func_convert_core_path_wine_to_w32 ARG
+# Helper function used by path conversion functions when $build is *nix, and
+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
+# configured wine environment available, with the winepath program in $build's
+# $PATH. Assumes ARG has no leading or trailing path separator characters.
+#
+# ARG is path to be converted from $build format to win32.
+# Result is available in $func_convert_core_path_wine_to_w32_result.
+# Unconvertible file (directory) names in ARG are skipped; if no directory names
+# are convertible, then the result may be empty.
+func_convert_core_path_wine_to_w32 ()
+{
+ $opt_debug
+ # unfortunately, winepath doesn't convert paths, only file names
+ func_convert_core_path_wine_to_w32_result=""
+ if test -n "$1"; then
+ oldIFS=$IFS
+ IFS=:
+ for func_convert_core_path_wine_to_w32_f in $1; do
+ IFS=$oldIFS
+ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
+ if test -n "$func_convert_core_file_wine_to_w32_result" ; then
+ if test -z "$func_convert_core_path_wine_to_w32_result"; then
+ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
+ else
+ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
+ fi
+ fi
+ done
+ IFS=$oldIFS
+ fi
+}
+# end: func_convert_core_path_wine_to_w32
+
+
+# func_cygpath ARGS...
+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
+# (2), returns the Cygwin file name or path in func_cygpath_result (input
+# file name or path is assumed to be in w32 format, as previously converted
+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
+# or path in func_cygpath_result (input file name or path is assumed to be in
+# Cygwin format). Returns an empty string on error.
+#
+# ARGS are passed to cygpath, with the last one being the file name or path to
+# be converted.
+#
+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
+# environment variable; do not put it in $PATH.
+func_cygpath ()
+{
+ $opt_debug
+ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
+ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
+ if test "$?" -ne 0; then
+ # on failure, ensure result is empty
+ func_cygpath_result=
+ fi
+ else
+ func_cygpath_result=
+ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+ fi
+}
+#end: func_cygpath
+
+
+# func_convert_core_msys_to_w32 ARG
+# Convert file name or path ARG from MSYS format to w32 format. Return
+# result in func_convert_core_msys_to_w32_result.
+func_convert_core_msys_to_w32 ()
+{
+ $opt_debug
+ # awkward: cmd appends spaces to result
+ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+}
+#end: func_convert_core_msys_to_w32
+
+
+# func_convert_file_check ARG1 ARG2
+# Verify that ARG1 (a file name in $build format) was converted to $host
+# format in ARG2. Otherwise, emit an error message, but continue (resetting
+# func_to_host_file_result to ARG1).
+func_convert_file_check ()
+{
+ $opt_debug
+ if test -z "$2" && test -n "$1" ; then
+ func_error "Could not determine host file name corresponding to"
+ func_error " \`$1'"
+ func_error "Continuing, but uninstalled executables may not work."
+ # Fallback:
+ func_to_host_file_result="$1"
+ fi
+}
+# end func_convert_file_check
+
+
+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
+# Verify that FROM_PATH (a path in $build format) was converted to $host
+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
+# func_to_host_file_result to a simplistic fallback value (see below).
+func_convert_path_check ()
+{
+ $opt_debug
+ if test -z "$4" && test -n "$3"; then
+ func_error "Could not determine the host path corresponding to"
+ func_error " \`$3'"
+ func_error "Continuing, but uninstalled executables may not work."
+ # Fallback. This is a deliberately simplistic "conversion" and
+ # should not be "improved". See libtool.info.
+ if test "x$1" != "x$2"; then
+ lt_replace_pathsep_chars="s|$1|$2|g"
+ func_to_host_path_result=`echo "$3" |
+ $SED -e "$lt_replace_pathsep_chars"`
+ else
+ func_to_host_path_result="$3"
+ fi
+ fi
+}
+# end func_convert_path_check
+
+
+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
+# and appending REPL if ORIG matches BACKPAT.
+func_convert_path_front_back_pathsep ()
+{
+ $opt_debug
+ case $4 in
+ $1 ) func_to_host_path_result="$3$func_to_host_path_result"
+ ;;
+ esac
+ case $4 in
+ $2 ) func_append func_to_host_path_result "$3"
+ ;;
+ esac
+}
+# end func_convert_path_front_back_pathsep
+
+
+##################################################
+# $build to $host FILE NAME CONVERSION FUNCTIONS #
+##################################################
+# invoked via `$to_host_file_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# Result will be available in $func_to_host_file_result.
+
+
+# func_to_host_file ARG
+# Converts the file name ARG from $build format to $host format. Return result
+# in func_to_host_file_result.
+func_to_host_file ()
+{
+ $opt_debug
+ $to_host_file_cmd "$1"
+}
+# end func_to_host_file
+
+
+# func_to_tool_file ARG LAZY
+# converts the file name ARG from $build format to toolchain format. Return
+# result in func_to_tool_file_result. If the conversion in use is listed
+# in (the comma separated) LAZY, no conversion takes place.
+func_to_tool_file ()
+{
+ $opt_debug
+ case ,$2, in
+ *,"$to_tool_file_cmd",*)
+ func_to_tool_file_result=$1
+ ;;
+ *)
+ $to_tool_file_cmd "$1"
+ func_to_tool_file_result=$func_to_host_file_result
+ ;;
+ esac
+}
+# end func_to_tool_file
+
+
+# func_convert_file_noop ARG
+# Copy ARG to func_to_host_file_result.
+func_convert_file_noop ()
+{
+ func_to_host_file_result="$1"
+}
+# end func_convert_file_noop
+
+
+# func_convert_file_msys_to_w32 ARG
+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper. Returns result in
+# func_to_host_file_result.
+func_convert_file_msys_to_w32 ()
+{
+ $opt_debug
+ func_to_host_file_result="$1"
+ if test -n "$1"; then
+ func_convert_core_msys_to_w32 "$1"
+ func_to_host_file_result="$func_convert_core_msys_to_w32_result"
+ fi
+ func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_w32
+
+
+# func_convert_file_cygwin_to_w32 ARG
+# Convert file name ARG from Cygwin to w32 format. Returns result in
+# func_to_host_file_result.
+func_convert_file_cygwin_to_w32 ()
+{
+ $opt_debug
+ func_to_host_file_result="$1"
+ if test -n "$1"; then
+ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
+ # LT_CYGPATH in this case.
+ func_to_host_file_result=`cygpath -m "$1"`
+ fi
+ func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_cygwin_to_w32
+
+
+# func_convert_file_nix_to_w32 ARG
+# Convert file name ARG from *nix to w32 format. Requires a wine environment
+# and a working winepath. Returns result in func_to_host_file_result.
+func_convert_file_nix_to_w32 ()
+{
+ $opt_debug
+ func_to_host_file_result="$1"
+ if test -n "$1"; then
+ func_convert_core_file_wine_to_w32 "$1"
+ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
+ fi
+ func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_w32
+
+
+# func_convert_file_msys_to_cygwin ARG
+# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_file_msys_to_cygwin ()
+{
+ $opt_debug
+ func_to_host_file_result="$1"
+ if test -n "$1"; then
+ func_convert_core_msys_to_w32 "$1"
+ func_cygpath -u "$func_convert_core_msys_to_w32_result"
+ func_to_host_file_result="$func_cygpath_result"
+ fi
+ func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_cygwin
+
+
+# func_convert_file_nix_to_cygwin ARG
+# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed
+# in a wine environment, working winepath, and LT_CYGPATH set. Returns result
+# in func_to_host_file_result.
+func_convert_file_nix_to_cygwin ()
+{
+ $opt_debug
+ func_to_host_file_result="$1"
+ if test -n "$1"; then
+ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
+ func_convert_core_file_wine_to_w32 "$1"
+ func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
+ func_to_host_file_result="$func_cygpath_result"
+ fi
+ func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_cygwin
+
+
+#############################################
+# $build to $host PATH CONVERSION FUNCTIONS #
+#############################################
+# invoked via `$to_host_path_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# The result will be available in $func_to_host_path_result.
+#
+# Path separators are also converted from $build format to $host format. If
+# ARG begins or ends with a path separator character, it is preserved (but
+# converted to $host format) on output.
+#
+# All path conversion functions are named using the following convention:
+# file name conversion function : func_convert_file_X_to_Y ()
+# path conversion function : func_convert_path_X_to_Y ()
+# where, for any given $build/$host combination the 'X_to_Y' value is the
+# same. If conversion functions are added for new $build/$host combinations,
+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
+# will break.
+
+
+# func_init_to_host_path_cmd
+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
+# appropriate value, based on the value of $to_host_file_cmd.
+to_host_path_cmd=
+func_init_to_host_path_cmd ()
+{
+ $opt_debug
+ if test -z "$to_host_path_cmd"; then
+ func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
+ to_host_path_cmd="func_convert_path_${func_stripname_result}"
+ fi
+}
+
+
+# func_to_host_path ARG
+# Converts the path ARG from $build format to $host format. Return result
+# in func_to_host_path_result.
+func_to_host_path ()
+{
+ $opt_debug
+ func_init_to_host_path_cmd
+ $to_host_path_cmd "$1"
+}
+# end func_to_host_path
+
+
+# func_convert_path_noop ARG
+# Copy ARG to func_to_host_path_result.
+func_convert_path_noop ()
+{
+ func_to_host_path_result="$1"
+}
+# end func_convert_path_noop
+
+
+# func_convert_path_msys_to_w32 ARG
+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper. Returns result in
+# func_to_host_path_result.
+func_convert_path_msys_to_w32 ()
+{
+ $opt_debug
+ func_to_host_path_result="$1"
+ if test -n "$1"; then
+ # Remove leading and trailing path separator characters from ARG. MSYS
+ # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
+ # and winepath ignores them completely.
+ func_stripname : : "$1"
+ func_to_host_path_tmp1=$func_stripname_result
+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+ func_to_host_path_result="$func_convert_core_msys_to_w32_result"
+ func_convert_path_check : ";" \
+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+ fi
+}
+# end func_convert_path_msys_to_w32
+
+
+# func_convert_path_cygwin_to_w32 ARG
+# Convert path ARG from Cygwin to w32 format. Returns result in
+# func_to_host_file_result.
+func_convert_path_cygwin_to_w32 ()
+{
+ $opt_debug
+ func_to_host_path_result="$1"
+ if test -n "$1"; then
+ # See func_convert_path_msys_to_w32:
+ func_stripname : : "$1"
+ func_to_host_path_tmp1=$func_stripname_result
+ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
+ func_convert_path_check : ";" \
+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+ fi
+}
+# end func_convert_path_cygwin_to_w32
+
+
+# func_convert_path_nix_to_w32 ARG
+# Convert path ARG from *nix to w32 format. Requires a wine environment and
+# a working winepath. Returns result in func_to_host_file_result.
+func_convert_path_nix_to_w32 ()
+{
+ $opt_debug
+ func_to_host_path_result="$1"
+ if test -n "$1"; then
+ # See func_convert_path_msys_to_w32:
+ func_stripname : : "$1"
+ func_to_host_path_tmp1=$func_stripname_result
+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
+ func_convert_path_check : ";" \
+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+ fi
+}
+# end func_convert_path_nix_to_w32
+
+
+# func_convert_path_msys_to_cygwin ARG
+# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_path_msys_to_cygwin ()
+{
+ $opt_debug
+ func_to_host_path_result="$1"
+ if test -n "$1"; then
+ # See func_convert_path_msys_to_w32:
+ func_stripname : : "$1"
+ func_to_host_path_tmp1=$func_stripname_result
+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+ func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
+ func_to_host_path_result="$func_cygpath_result"
+ func_convert_path_check : : \
+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+ fi
+}
+# end func_convert_path_msys_to_cygwin
+
+
+# func_convert_path_nix_to_cygwin ARG
+# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a
+# a wine environment, working winepath, and LT_CYGPATH set. Returns result in
+# func_to_host_file_result.
+func_convert_path_nix_to_cygwin ()
+{
+ $opt_debug
+ func_to_host_path_result="$1"
+ if test -n "$1"; then
+ # Remove leading and trailing path separator characters from
+ # ARG. msys behavior is inconsistent here, cygpath turns them
+ # into '.;' and ';.', and winepath ignores them completely.
+ func_stripname : : "$1"
+ func_to_host_path_tmp1=$func_stripname_result
+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
+ func_to_host_path_result="$func_cygpath_result"
+ func_convert_path_check : : \
+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+ fi
+}
+# end func_convert_path_nix_to_cygwin
+
+
# func_mode_compile arg...
func_mode_compile ()
{
@@ -1137,12 +1985,12 @@ func_mode_compile ()
;;
-pie | -fpie | -fPIE)
- pie_flag="$pie_flag $arg"
+ func_append pie_flag " $arg"
continue
;;
-shared | -static | -prefer-pic | -prefer-non-pic)
- later="$later $arg"
+ func_append later " $arg"
continue
;;
@@ -1163,15 +2011,14 @@ func_mode_compile ()
save_ifs="$IFS"; IFS=','
for arg in $args; do
IFS="$save_ifs"
- func_quote_for_eval "$arg"
- lastarg="$lastarg $func_quote_for_eval_result"
+ func_append_quoted lastarg "$arg"
done
IFS="$save_ifs"
func_stripname ' ' '' "$lastarg"
lastarg=$func_stripname_result
# Add the arguments to base_compile.
- base_compile="$base_compile $lastarg"
+ func_append base_compile " $lastarg"
continue
;;
@@ -1187,8 +2034,7 @@ func_mode_compile ()
esac # case $arg_mode
# Aesthetically quote the previous argument.
- func_quote_for_eval "$lastarg"
- base_compile="$base_compile $func_quote_for_eval_result"
+ func_append_quoted base_compile "$lastarg"
done # for arg
case $arg_mode in
@@ -1213,7 +2059,7 @@ func_mode_compile ()
*.[cCFSifmso] | \
*.ada | *.adb | *.ads | *.asm | \
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
- *.[fF][09]? | *.for | *.java | *.obj | *.sx)
+ *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
func_xform "$libobj"
libobj=$func_xform_result
;;
@@ -1288,7 +2134,7 @@ func_mode_compile ()
# Calculate the filename of the output object if compiler does
# not support -o with -c
if test "$compiler_c_o" = no; then
- output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+ output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
lockfile="$output_obj.lock"
else
output_obj=
@@ -1319,17 +2165,16 @@ compiler."
$opt_dry_run || $RM $removelist
exit $EXIT_FAILURE
fi
- removelist="$removelist $output_obj"
+ func_append removelist " $output_obj"
$ECHO "$srcfile" > "$lockfile"
fi
$opt_dry_run || $RM $removelist
- removelist="$removelist $lockfile"
+ func_append removelist " $lockfile"
trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
- if test -n "$fix_srcfile_path"; then
- eval srcfile=\"$fix_srcfile_path\"
- fi
+ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
+ srcfile=$func_to_tool_file_result
func_quote_for_eval "$srcfile"
qsrcfile=$func_quote_for_eval_result
@@ -1349,7 +2194,7 @@ compiler."
if test -z "$output_obj"; then
# Place PIC objects in $objdir
- command="$command -o $lobj"
+ func_append command " -o $lobj"
fi
func_show_eval_locale "$command" \
@@ -1396,11 +2241,11 @@ compiler."
command="$base_compile $qsrcfile $pic_flag"
fi
if test "$compiler_c_o" = yes; then
- command="$command -o $obj"
+ func_append command " -o $obj"
fi
# Suppress compiler output if we already did a PIC compilation.
- command="$command$suppress_output"
+ func_append command "$suppress_output"
func_show_eval_locale "$command" \
'$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
@@ -1445,13 +2290,13 @@ compiler."
}
$opt_help || {
-test "$mode" = compile && func_mode_compile ${1+"$@"}
+ test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
}
func_mode_help ()
{
# We need to display help for each of the modes.
- case $mode in
+ case $opt_mode in
"")
# Generic help is extracted from the usage comments
# at the start of this file.
@@ -1482,10 +2327,11 @@ This mode accepts the following addition
-o OUTPUT-FILE set the output file name to OUTPUT-FILE
-no-suppress do not suppress compiler output for multiple passes
- -prefer-pic try to building PIC objects only
- -prefer-non-pic try to building non-PIC objects only
+ -prefer-pic try to build PIC objects only
+ -prefer-non-pic try to build non-PIC objects only
-shared do not build a \`.o' file suitable for static linking
-static only build a \`.o' file suitable for static linking
+ -Wc,FLAG pass FLAG directly to the compiler
COMPILE-COMMAND is a command to be used in creating a \`standard' object file
from the given SOURCEFILE.
@@ -1538,7 +2384,7 @@ either the \`install' or \`cp' program.
The following components of INSTALL-COMMAND are treated specially:
- -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation
+ -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation
The rest of the components are interpreted as arguments to that command (only
BSD-compatible install options are recognized)."
@@ -1558,6 +2404,8 @@ The following components of LINK-COMMAND
-all-static do not do any dynamic linking at all
-avoid-version do not add a version suffix if possible
+ -bindir BINDIR specify path to binaries directory (for systems where
+ libraries must be found in the PATH setting at runtime)
-dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
@@ -1586,6 +2434,11 @@ The following components of LINK-COMMAND
-version-info CURRENT[:REVISION[:AGE]]
specify library version info [each variable defaults to 0]
-weak LIBNAME declare that the target provides the LIBNAME interface
+ -Wc,FLAG
+ -Xcompiler FLAG pass linker-specific FLAG directly to the compiler
+ -Wl,FLAG
+ -Xlinker FLAG pass linker-specific FLAG directly to the linker
+ -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC)
All other options (arguments beginning with \`-') are ignored.
@@ -1619,18 +2472,44 @@ Otherwise, only FILE itself is deleted u
;;
*)
- func_fatal_help "invalid operation mode \`$mode'"
+ func_fatal_help "invalid operation mode \`$opt_mode'"
;;
esac
- $ECHO
+ echo
$ECHO "Try \`$progname --help' for more information about other modes."
-
- exit $?
}
- # Now that we've collected a possible --mode arg, show help if necessary
- $opt_help && func_mode_help
+# Now that we've collected a possible --mode arg, show help if necessary
+if $opt_help; then
+ if test "$opt_help" = :; then
+ func_mode_help
+ else
+ {
+ func_help noexit
+ for opt_mode in compile link execute install finish uninstall clean; do
+ func_mode_help
+ done
+ } | sed -n '1p; 2,$s/^Usage:/ or: /p'
+ {
+ func_help noexit
+ for opt_mode in compile link execute install finish uninstall clean; do
+ echo
+ func_mode_help
+ done
+ } |
+ sed '1d
+ /^When reporting/,/^Report/{
+ H
+ d
+ }
+ $x
+ /information about other modes/d
+ /more detailed .*MODE/d
+ s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
+ fi
+ exit $?
+fi
# func_mode_execute arg...
@@ -1643,13 +2522,16 @@ func_mode_execute ()
func_fatal_help "you must specify a COMMAND"
# Handle -dlopen flags immediately.
- for file in $execute_dlfiles; do
+ for file in $opt_dlopen; do
test -f "$file" \
|| func_fatal_help "\`$file' is not a file"
dir=
case $file in
*.la)
+ func_resolve_sysroot "$file"
+ file=$func_resolve_sysroot_result
+
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
|| func_fatal_help "\`$lib' is not a valid libtool archive"
@@ -1671,7 +2553,7 @@ func_mode_execute ()
dir="$func_dirname_result"
if test -f "$dir/$objdir/$dlname"; then
- dir="$dir/$objdir"
+ func_append dir "/$objdir"
else
if test ! -f "$dir/$dlname"; then
func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
@@ -1712,7 +2594,7 @@ func_mode_execute ()
for file
do
case $file in
- -*) ;;
+ -* | *.la | *.lo ) ;;
*)
# Do a test to see if this is really a libtool program.
if func_ltwrapper_script_p "$file"; then
@@ -1728,8 +2610,7 @@ func_mode_execute ()
;;
esac
# Quote arguments (to preserve shell metacharacters).
- func_quote_for_eval "$file"
- args="$args $func_quote_for_eval_result"
+ func_append_quoted args "$file"
done
if test "X$opt_dry_run" = Xfalse; then
@@ -1754,29 +2635,66 @@ func_mode_execute ()
# Display what would be done.
if test -n "$shlibpath_var"; then
eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
- $ECHO "export $shlibpath_var"
+ echo "export $shlibpath_var"
fi
$ECHO "$cmd$args"
exit $EXIT_SUCCESS
fi
}
-test "$mode" = execute && func_mode_execute ${1+"$@"}
+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
+
+
+# func_mode_finish arg...
+func_mode_finish ()
+{
+ $opt_debug
+ libs=
+ libdirs=
+ admincmds=
+
+ for opt in "$nonopt" ${1+"$@"}
+ do
+ if test -d "$opt"; then
+ func_append libdirs " $opt"
+
+ elif test -f "$opt"; then
+ if func_lalib_unsafe_p "$opt"; then
+ func_append libs " $opt"
+ else
+ func_warning "\`$opt' is not a valid libtool archive"
+ fi
+
+ else
+ func_fatal_error "invalid argument \`$opt'"
+ fi
+ done
+ if test -n "$libs"; then
+ if test -n "$lt_sysroot"; then
+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
+ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
+ else
+ sysroot_cmd=
+ fi
-# func_mode_finish arg...
-func_mode_finish ()
-{
- $opt_debug
- libdirs="$nonopt"
- admincmds=
+ # Remove sysroot references
+ if $opt_dry_run; then
+ for lib in $libs; do
+ echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
+ done
+ else
+ tmpdir=`func_mktempdir`
+ for lib in $libs; do
+ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+ > $tmpdir/tmp-la
+ mv -f $tmpdir/tmp-la $lib
+ done
+ ${RM}r "$tmpdir"
+ fi
+ fi
if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
- for dir
- do
- libdirs="$libdirs $dir"
- done
-
for libdir in $libdirs; do
if test -n "$finish_cmds"; then
# Do each command in the finish commands.
@@ -1786,7 +2704,7 @@ func_mode_finish ()
if test -n "$finish_eval"; then
# Do the single finish_eval.
eval cmds=\"$finish_eval\"
- $opt_dry_run || eval "$cmds" || admincmds="$admincmds
+ $opt_dry_run || eval "$cmds" || func_append admincmds "
$cmds"
fi
done
@@ -1795,53 +2713,55 @@ func_mode_finish ()
# Exit here if they wanted silent mode.
$opt_silent && exit $EXIT_SUCCESS
- $ECHO "X----------------------------------------------------------------------" | $Xsed
- $ECHO "Libraries have been installed in:"
- for libdir in $libdirs; do
- $ECHO " $libdir"
- done
- $ECHO
- $ECHO "If you ever happen to want to link against installed libraries"
- $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
- $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
- $ECHO "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable"
- $ECHO " during execution"
- fi
- if test -n "$runpath_var"; then
- $ECHO " - add LIBDIR to the \`$runpath_var' environment variable"
- $ECHO " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+ echo "----------------------------------------------------------------------"
+ echo "Libraries have been installed in:"
+ for libdir in $libdirs; do
+ $ECHO " $libdir"
+ done
+ echo
+ echo "If you ever happen to want to link against installed libraries"
+ echo "in a given directory, LIBDIR, you must either use libtool, and"
+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+ echo "flag during linking and do at least one of the following:"
+ if test -n "$shlibpath_var"; then
+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
+ echo " during execution"
+ fi
+ if test -n "$runpath_var"; then
+ echo " - add LIBDIR to the \`$runpath_var' environment variable"
+ echo " during linking"
+ fi
+ if test -n "$hardcode_libdir_flag_spec"; then
+ libdir=LIBDIR
+ eval flag=\"$hardcode_libdir_flag_spec\"
- $ECHO " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- $ECHO " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- $ECHO
+ $ECHO " - use the \`$flag' linker flag"
+ fi
+ if test -n "$admincmds"; then
+ $ECHO " - have your system administrator run these commands:$admincmds"
+ fi
+ if test -f /etc/ld.so.conf; then
+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+ fi
+ echo
- $ECHO "See any operating system documentation about shared libraries for"
- case $host in
- solaris2.[6789]|solaris2.1[0-9])
- $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
- $ECHO "pages."
- ;;
- *)
- $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
- ;;
- esac
- $ECHO "X----------------------------------------------------------------------" | $Xsed
+ echo "See any operating system documentation about shared libraries for"
+ case $host in
+ solaris2.[6789]|solaris2.1[0-9])
+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+ echo "pages."
+ ;;
+ *)
+ echo "more information, such as the ld(1) and ld.so(8) manual pages."
+ ;;
+ esac
+ echo "----------------------------------------------------------------------"
+ fi
exit $EXIT_SUCCESS
}
-test "$mode" = finish && func_mode_finish ${1+"$@"}
+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
# func_mode_install arg...
@@ -1852,7 +2772,7 @@ func_mode_install ()
# install_prog (especially on Windows NT).
if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
# Allow the use of GNU shtool's install command.
- $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
+ case $nonopt in *shtool*) :;; *) false;; esac; then
# Aesthetically quote it.
func_quote_for_eval "$nonopt"
install_prog="$func_quote_for_eval_result "
@@ -1866,7 +2786,12 @@ func_mode_install ()
# The real first argument should be the name of the installation program.
# Aesthetically quote it.
func_quote_for_eval "$arg"
- install_prog="$install_prog$func_quote_for_eval_result"
+ func_append install_prog "$func_quote_for_eval_result"
+ install_shared_prog=$install_prog
+ case " $install_prog " in
+ *[\\\ /]cp\ *) install_cp=: ;;
+ *) install_cp=false ;;
+ esac
# We need to accept at least all the BSD install flags.
dest=
@@ -1876,10 +2801,12 @@ func_mode_install ()
install_type=
isdir=no
stripme=
+ no_mode=:
for arg
do
+ arg2=
if test -n "$dest"; then
- files="$files $dest"
+ func_append files " $dest"
dest=$arg
continue
fi
@@ -1887,10 +2814,9 @@ func_mode_install ()
case $arg in
-d) isdir=yes ;;
-f)
- case " $install_prog " in
- *[\\\ /]cp\ *) ;;
- *) prev=$arg ;;
- esac
+ if $install_cp; then :; else
+ prev=$arg
+ fi
;;
-g | -m | -o)
prev=$arg
@@ -1904,6 +2830,10 @@ func_mode_install ()
*)
# If the previous option needed an argument, then skip it.
if test -n "$prev"; then
+ if test "x$prev" = x-m && test -n "$install_override_mode"; then
+ arg2=$install_override_mode
+ no_mode=false
+ fi
prev=
else
dest=$arg
@@ -1914,7 +2844,11 @@ func_mode_install ()
# Aesthetically quote the argument.
func_quote_for_eval "$arg"
- install_prog="$install_prog $func_quote_for_eval_result"
+ func_append install_prog " $func_quote_for_eval_result"
+ if test -n "$arg2"; then
+ func_quote_for_eval "$arg2"
+ fi
+ func_append install_shared_prog " $func_quote_for_eval_result"
done
test -z "$install_prog" && \
@@ -1923,6 +2857,13 @@ func_mode_install ()
test -n "$prev" && \
func_fatal_help "the \`$prev' option requires an argument"
+ if test -n "$install_override_mode" && $no_mode; then
+ if $install_cp; then :; else
+ func_quote_for_eval "$install_override_mode"
+ func_append install_shared_prog " -m $func_quote_for_eval_result"
+ fi
+ fi
+
if test -z "$files"; then
if test -z "$dest"; then
func_fatal_help "no file or destination specified"
@@ -1977,10 +2918,13 @@ func_mode_install ()
case $file in
*.$libext)
# Do the static libraries later.
- staticlibs="$staticlibs $file"
+ func_append staticlibs " $file"
;;
*.la)
+ func_resolve_sysroot "$file"
+ file=$func_resolve_sysroot_result
+
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
|| func_fatal_help "\`$file' is not a valid libtool archive"
@@ -1994,23 +2938,23 @@ func_mode_install ()
if test "X$destdir" = "X$libdir"; then
case "$current_libdirs " in
*" $libdir "*) ;;
- *) current_libdirs="$current_libdirs $libdir" ;;
+ *) func_append current_libdirs " $libdir" ;;
esac
else
# Note the libdir as a future libdir.
case "$future_libdirs " in
*" $libdir "*) ;;
- *) future_libdirs="$future_libdirs $libdir" ;;
+ *) func_append future_libdirs " $libdir" ;;
esac
fi
func_dirname "$file" "/" ""
dir="$func_dirname_result"
- dir="$dir$objdir"
+ func_append dir "$objdir"
if test -n "$relink_command"; then
# Determine the prefix the user has applied to our future dir.
- inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
+ inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
# Don't allow the user to place us outside of our expected
# location b/c this prevents finding dependent libraries that
@@ -2023,9 +2967,9 @@ func_mode_install ()
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
else
- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
+ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
fi
func_warning "relinking \`$file'"
@@ -2043,7 +2987,7 @@ func_mode_install ()
test -n "$relink_command" && srcname="$realname"T
# Install the shared library and build the symlinks.
- func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
+ func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
'exit $?'
tstripme="$stripme"
case $host_os in
@@ -2083,7 +3027,7 @@ func_mode_install ()
func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
# Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+ test -n "$old_library" && func_append staticlibs " $dir/$old_library"
;;
*.lo)
@@ -2183,7 +3127,7 @@ func_mode_install ()
if test -f "$lib"; then
func_source "$lib"
fi
- libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+ libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
if test -n "$libdir" && test ! -f "$libfile"; then
func_warning "\`$lib' has not been installed in \`$libdir'"
finalize=no
@@ -2202,7 +3146,7 @@ func_mode_install ()
file="$func_basename_result"
outputname="$tmpdir/$file"
# Replace the output file specification.
- relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+ relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
$opt_silent || {
func_quote_for_expand "$relink_command"
@@ -2221,7 +3165,7 @@ func_mode_install ()
}
else
# Install the binary that we compiled earlier.
- file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+ file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
fi
fi
@@ -2280,7 +3224,7 @@ func_mode_install ()
fi
}
-test "$mode" = install && func_mode_install ${1+"$@"}
+test "$opt_mode" = install && func_mode_install ${1+"$@"}
# func_generate_dlsyms outputname originator pic_p
@@ -2323,6 +3267,22 @@ func_generate_dlsyms ()
extern \"C\" {
#endif
+#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
+#endif
+
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+ relocations are performed -- see ld's documentation on pseudo-relocs. */
+# define LT_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data. */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
/* External symbol declarations for the compiler. */\
"
@@ -2332,10 +3292,11 @@ extern \"C\" {
$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
# Add our own program objects to the symbol list.
- progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
for progfile in $progfiles; do
- func_verbose "extracting global C symbols from \`$progfile'"
- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32
+ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
+ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
done
if test -n "$exclude_expsyms"; then
@@ -2371,7 +3332,7 @@ extern \"C\" {
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
- *cygwin | *mingw* | *cegcc* )
+ *cygwin* | *mingw* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
;;
@@ -2384,10 +3345,52 @@ extern \"C\" {
func_verbose "extracting global C symbols from \`$dlprefile'"
func_basename "$dlprefile"
name="$func_basename_result"
- $opt_dry_run || {
- eval '$ECHO ": $name " >> "$nlist"'
- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
- }
+ case $host in
+ *cygwin* | *mingw* | *cegcc* )
+ # if an import library, we need to obtain dlname
+ if func_win32_import_lib_p "$dlprefile"; then
+ func_tr_sh "$dlprefile"
+ eval "curr_lafile=\$libfile_$func_tr_sh_result"
+ dlprefile_dlbasename=""
+ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
+ # Use subshell, to avoid clobbering current variable values
+ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
+ if test -n "$dlprefile_dlname" ; then
+ func_basename "$dlprefile_dlname"
+ dlprefile_dlbasename="$func_basename_result"
+ else
+ # no lafile. user explicitly requested -dlpreopen <import library>.
+ $sharedlib_from_linklib_cmd "$dlprefile"
+ dlprefile_dlbasename=$sharedlib_from_linklib_result
+ fi
+ fi
+ $opt_dry_run || {
+ if test -n "$dlprefile_dlbasename" ; then
+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
+ else
+ func_warning "Could not compute DLL name from $name"
+ eval '$ECHO ": $name " >> "$nlist"'
+ fi
+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
+ }
+ else # not an import lib
+ $opt_dry_run || {
+ eval '$ECHO ": $name " >> "$nlist"'
+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+ }
+ fi
+ ;;
+ *)
+ $opt_dry_run || {
+ eval '$ECHO ": $name " >> "$nlist"'
+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+ }
+ ;;
+ esac
done
$opt_dry_run || {
@@ -2415,36 +3418,19 @@ extern \"C\" {
if test -f "$nlist"S; then
eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
else
- $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
+ echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
fi
- $ECHO >> "$output_objdir/$my_dlsyms" "\
+ echo >> "$output_objdir/$my_dlsyms" "\
/* The mapping between symbol names and symbols. */
typedef struct {
const char *name;
void *address;
} lt_dlsymlist;
-"
- case $host in
- *cygwin* | *mingw* | *cegcc* )
- $ECHO >> "$output_objdir/$my_dlsyms" "\
-/* DATA imports from DLLs on WIN32 con't be const, because
- runtime relocations are performed -- see ld's documentation
- on pseudo-relocs. */"
- lt_dlsym_const= ;;
- *osf5*)
- echo >> "$output_objdir/$my_dlsyms" "\
-/* This system does not cope well with relocations in const data */"
- lt_dlsym_const= ;;
- *)
- lt_dlsym_const=const ;;
- esac
-
- $ECHO >> "$output_objdir/$my_dlsyms" "\
-extern $lt_dlsym_const lt_dlsymlist
+extern LT_DLSYM_CONST lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[];
-$lt_dlsym_const lt_dlsymlist
+LT_DLSYM_CONST lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[] =
{\
{ \"$my_originator\", (void *) 0 },"
@@ -2457,7 +3443,7 @@ lt_${my_prefix}_LTX_preloaded_symbols[]
eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
;;
esac
- $ECHO >> "$output_objdir/$my_dlsyms" "\
+ echo >> "$output_objdir/$my_dlsyms" "\
{0, (void *) 0}
};
@@ -2500,7 +3486,7 @@ static const void *lt_preloaded_setup()
for arg in $LTCFLAGS; do
case $arg in
-pie | -fpie | -fPIE) ;;
- *) symtab_cflags="$symtab_cflags $arg" ;;
+ *) func_append symtab_cflags " $arg" ;;
esac
done
@@ -2515,16 +3501,16 @@ static const void *lt_preloaded_setup()
case $host in
*cygwin* | *mingw* | *cegcc* )
if test -f "$output_objdir/$my_outputname.def"; then
- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
else
- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
fi
;;
*)
- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
;;
esac
;;
@@ -2538,8 +3524,8 @@ static const void *lt_preloaded_setup()
# really was required.
# Nullify the symbol file.
- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+ compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
+ finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
fi
}
@@ -2549,6 +3535,7 @@ static const void *lt_preloaded_setup()
# Need a lot of goo to handle *both* DLLs and import libs
# Has to be a shell function in order to 'eat' the argument
# that is supplied when $file_magic_command is called.
+# Despite the name, also deal with 64 bit binaries.
func_win32_libid ()
{
$opt_debug
@@ -2559,9 +3546,11 @@ func_win32_libid ()
win32_libid_type="x86 archive import"
;;
*ar\ archive*) # could be an import, or static
+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
- $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
- win32_nmres=`eval $NM -f posix -A $1 |
+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
$SED -n -e '
1,100{
/ I /{
@@ -2590,6 +3579,131 @@ func_win32_libid ()
$ECHO "$win32_libid_type"
}
+# func_cygming_dll_for_implib ARG
+#
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+# Invoked by eval'ing the libtool variable
+# $sharedlib_from_linklib_cmd
+# Result is available in the variable
+# $sharedlib_from_linklib_result
+func_cygming_dll_for_implib ()
+{
+ $opt_debug
+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
+}
+
+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
+#
+# The is the core of a fallback implementation of a
+# platform-specific function to extract the name of the
+# DLL associated with the specified import library LIBNAME.
+#
+# SECTION_NAME is either .idata$6 or .idata$7, depending
+# on the platform and compiler that created the implib.
+#
+# Echos the name of the DLL associated with the
+# specified import library.
+func_cygming_dll_for_implib_fallback_core ()
+{
+ $opt_debug
+ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
+ $SED '/^Contents of section '"$match_literal"':/{
+ # Place marker at beginning of archive member dllname section
+ s/.*/====MARK====/
+ p
+ d
+ }
+ # These lines can sometimes be longer than 43 characters, but
+ # are always uninteresting
+ /:[ ]*file format pe[i]\{,1\}-/d
+ /^In archive [^:]*:/d
+ # Ensure marker is printed
+ /^====MARK====/p
+ # Remove all lines with less than 43 characters
+ /^.\{43\}/!d
+ # From remaining lines, remove first 43 characters
+ s/^.\{43\}//' |
+ $SED -n '
+ # Join marker and all lines until next marker into a single line
+ /^====MARK====/ b para
+ H
+ $ b para
+ b
+ :para
+ x
+ s/\n//g
+ # Remove the marker
+ s/^====MARK====//
+ # Remove trailing dots and whitespace
+ s/[\. \t]*$//
+ # Print
+ /./p' |
+ # we now have a list, one entry per line, of the stringified
+ # contents of the appropriate section of all members of the
+ # archive which possess that section. Heuristic: eliminate
+ # all those which have a first or second character that is
+ # a '.' (that is, objdump's representation of an unprintable
+ # character.) This should work for all archives with less than
+ # 0x302f exports -- but will fail for DLLs whose name actually
+ # begins with a literal '.' or a single character followed by
+ # a '.'.
+ #
+ # Of those that remain, print the first one.
+ $SED -e '/^\./d;/^.\./d;q'
+}
+
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+ $opt_debug
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
+ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+ test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+ $opt_debug
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+ test -n "$func_cygming_ms_implib_tmp"
+}
+
+# func_cygming_dll_for_implib_fallback ARG
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+#
+# This fallback implementation is for use when $DLLTOOL
+# does not support the --identify-strict option.
+# Invoked by eval'ing the libtool variable
+# $sharedlib_from_linklib_cmd
+# Result is available in the variable
+# $sharedlib_from_linklib_result
+func_cygming_dll_for_implib_fallback ()
+{
+ $opt_debug
+ if func_cygming_gnu_implib_p "$1" ; then
+ # binutils import library
+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
+ elif func_cygming_ms_implib_p "$1" ; then
+ # ms-generated import library
+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
+ else
+ # unknown
+ sharedlib_from_linklib_result=""
+ fi
+}
# func_extract_an_archive dir oldlib
@@ -2598,7 +3712,18 @@ func_extract_an_archive ()
$opt_debug
f_ex_an_ar_dir="$1"; shift
f_ex_an_ar_oldlib="$1"
- func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
+ if test "$lock_old_archive_extraction" = yes; then
+ lockfile=$f_ex_an_ar_oldlib.lock
+ until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+ func_echo "Waiting for $lockfile to be removed"
+ sleep 2
+ done
+ fi
+ func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
+ 'stat=$?; rm -f "$lockfile"; exit $stat'
+ if test "$lock_old_archive_extraction" = yes; then
+ $opt_dry_run || rm -f "$lockfile"
+ fi
if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
:
else
@@ -2669,7 +3794,7 @@ func_extract_archives ()
darwin_file=
darwin_files=
for darwin_file in $darwin_filelist; do
- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
$LIPO -create -output "$darwin_file" $darwin_files
done # $darwin_filelist
$RM -rf unfat-$$
@@ -2684,25 +3809,30 @@ func_extract_archives ()
func_extract_an_archive "$my_xdir" "$my_xabs"
;;
esac
- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
done
func_extract_archives_result="$my_oldobjs"
}
-
-# func_emit_wrapper_part1 [arg=no]
+# func_emit_wrapper [arg=no]
#
-# Emit the first part of a libtool wrapper script on stdout.
-# For more information, see the description associated with
-# func_emit_wrapper(), below.
-func_emit_wrapper_part1 ()
-{
- func_emit_wrapper_part1_arg1=no
- if test -n "$1" ; then
- func_emit_wrapper_part1_arg1=$1
- fi
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable. Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take. If 'yes', then the emitted script
+# will assume that the directory in which it is stored is
+# the $objdir directory. This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
+{
+ func_emit_wrapper_arg1=${1-no}
$ECHO "\
#! $SHELL
@@ -2718,7 +3848,6 @@ func_emit_wrapper_part1 ()
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst'
# Be Bourne compatible
@@ -2749,31 +3878,132 @@ if test \"\$libtool_install_magic\" = \"
else
# When we are sourced in execute mode, \$file and \$ECHO are already set.
if test \"\$libtool_execute_magic\" != \"$magic\"; then
- ECHO=\"$qecho\"
- file=\"\$0\"
- # Make sure echo works.
- if test \"X\$1\" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
- elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
- # Yippee, \$ECHO works!
- :
- else
- # Restart under the correct shell, and then maybe \$ECHO will work.
- exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
- fi
- fi\
+ file=\"\$0\""
+
+ qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
+ $ECHO "\
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+ eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+ ECHO=\"$qECHO\"
+ fi
+
+# Very basic option parsing. These options are (a) specific to
+# the libtool wrapper, (b) are identical between the wrapper
+# /script/ and the wrapper /executable/ which is used only on
+# windows platforms, and (c) all begin with the string "--lt-"
+# (application programs are unlikely to have options which match
+# this pattern).
+#
+# There are only two supported options: --lt-debug and
+# --lt-dump-script. There is, deliberately, no --lt-help.
+#
+# The first argument to this parsing function should be the
+# script's $0 value, followed by "$@".
+lt_option_debug=
+func_parse_lt_options ()
+{
+ lt_script_arg0=\$0
+ shift
+ for lt_opt
+ do
+ case \"\$lt_opt\" in
+ --lt-debug) lt_option_debug=1 ;;
+ --lt-dump-script)
+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
+ cat \"\$lt_dump_D/\$lt_dump_F\"
+ exit 0
+ ;;
+ --lt-*)
+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
+ exit 1
+ ;;
+ esac
+ done
+
+ # Print the debug banner immediately:
+ if test -n \"\$lt_option_debug\"; then
+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
+ fi
+}
+
+# Used when --lt-debug. Prints its arguments to stdout
+# (redirection is the responsibility of the caller)
+func_lt_dump_args ()
+{
+ lt_dump_args_N=1;
+ for lt_arg
+ do
+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
+ done
+}
+
+# Core function for launching the target application
+func_exec_program_core ()
+{
"
- $ECHO "\
+ case $host in
+ # Backslashes separate directories on plain windows
+ *-*-mingw | *-*-os2* | *-cegcc*)
+ $ECHO "\
+ if test -n \"\$lt_option_debug\"; then
+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
+ func_lt_dump_args \${1+\"\$@\"} 1>&2
+ fi
+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+ ;;
+
+ *)
+ $ECHO "\
+ if test -n \"\$lt_option_debug\"; then
+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
+ func_lt_dump_args \${1+\"\$@\"} 1>&2
+ fi
+ exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+ ;;
+ esac
+ $ECHO "\
+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+ exit 1
+}
+
+# A function to encapsulate launching the target application
+# Strips options in the --lt-* namespace from \$@ and
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
+ for lt_wr_arg
+ do
+ case \$lt_wr_arg in
+ --lt-*) ;;
+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+ esac
+ shift
+ done
+ func_exec_program_core \${1+\"\$@\"}
+}
+
+ # Parse options
+ func_parse_lt_options \"\$0\" \${1+\"\$@\"}
# Find the directory that this script lives in.
- thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+ thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
test \"x\$thisdir\" = \"x\$file\" && thisdir=.
# Follow symbolic links until we get to the real thisdir.
- file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+ file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
while test -n \"\$file\"; do
- destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+ destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
# If there was a directory component, then change thisdir.
if test \"x\$destdir\" != \"x\$file\"; then
@@ -2783,30 +4013,13 @@ else
esac
fi
- file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
- file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+ file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
+ file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
done
-"
-}
-# end: func_emit_wrapper_part1
-
-# func_emit_wrapper_part2 [arg=no]
-#
-# Emit the second part of a libtool wrapper script on stdout.
-# For more information, see the description associated with
-# func_emit_wrapper(), below.
-func_emit_wrapper_part2 ()
-{
- func_emit_wrapper_part2_arg1=no
- if test -n "$1" ; then
- func_emit_wrapper_part2_arg1=$1
- fi
-
- $ECHO "\
# Usually 'no', except on cygwin/mingw when embedded into
# the cwrapper.
- WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
+ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
# special case for '.'
if test \"\$thisdir\" = \".\"; then
@@ -2814,7 +4027,7 @@ func_emit_wrapper_part2 ()
fi
# remove .libs from thisdir
case \"\$thisdir\" in
- *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
+ *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
$objdir ) thisdir=. ;;
esac
fi
@@ -2869,6 +4082,18 @@ func_emit_wrapper_part2 ()
if test -f \"\$progdir/\$program\"; then"
+ # fixup the dll searchpath if we need to.
+ #
+ # Fix the DLL searchpath if we need to. Do this before prepending
+ # to shlibpath, because on Windows, both are PATH and uninstalled
+ # libraries must come first.
+ if test -n "$dllsearchpath"; then
+ $ECHO "\
+ # Add the dll search path components to the executable PATH
+ PATH=$dllsearchpath:\$PATH
+"
+ fi
+
# Export our shlibpath_var if we have one.
if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
$ECHO "\
@@ -2877,253 +4102,28 @@ func_emit_wrapper_part2 ()
# Some systems cannot cope with colon-terminated $shlibpath_var
# The second colon is a workaround for a bug in BeOS R4 sed
- $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+ $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
export $shlibpath_var
"
fi
- # fixup the dll searchpath if we need to.
- if test -n "$dllsearchpath"; then
- $ECHO "\
- # Add the dll search path components to the executable PATH
- PATH=$dllsearchpath:\$PATH
-"
- fi
-
$ECHO "\
if test \"\$libtool_execute_magic\" != \"$magic\"; then
# Run the actual program with our arguments.
-"
- case $host in
- # Backslashes separate directories on plain windows
- *-*-mingw | *-*-os2* | *-cegcc*)
- $ECHO "\
- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
- ;;
-
- *)
- $ECHO "\
- exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
- ;;
- esac
- $ECHO "\
- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
- exit 1
+ func_exec_program \${1+\"\$@\"}
fi
else
# The program doesn't exist.
\$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
\$ECHO \"This script is just a wrapper for \$program.\" 1>&2
- $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
- exit 1
- fi
-fi\
-"
-}
-# end: func_emit_wrapper_part2
-
-
-# func_emit_wrapper [arg=no]
-#
-# Emit a libtool wrapper script on stdout.
-# Don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw
-# wrapper executable. Must ONLY be called from within
-# func_mode_link because it depends on a number of variables
-# set therein.
-#
-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-# variable will take. If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
-# the $objdir directory. This is a cygwin/mingw-specific
-# behavior.
-func_emit_wrapper ()
-{
- func_emit_wrapper_arg1=no
- if test -n "$1" ; then
- func_emit_wrapper_arg1=$1
- fi
-
- # split this up so that func_emit_cwrapperexe_src
- # can call each part independently.
- func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
- func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
-}
-
-
-# func_to_host_path arg
-#
-# Convert paths to host format when used with build tools.
-# Intended for use with "native" mingw (where libtool itself
-# is running under the msys shell), or in the following cross-
-# build environments:
-# $build $host
-# mingw (msys) mingw [e.g. native]
-# cygwin mingw
-# *nix + wine mingw
-# where wine is equipped with the `winepath' executable.
-# In the native mingw case, the (msys) shell automatically
-# converts paths for any non-msys applications it launches,
-# but that facility isn't available from inside the cwrapper.
-# Similar accommodations are necessary for $host mingw and
-# $build cygwin. Calling this function does no harm for other
-# $host/$build combinations not listed above.
-#
-# ARG is the path (on $build) that should be converted to
-# the proper representation for $host. The result is stored
-# in $func_to_host_path_result.
-func_to_host_path ()
-{
- func_to_host_path_result="$1"
- if test -n "$1" ; then
- case $host in
- *mingw* )
- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
- case $build in
- *mingw* ) # actually, msys
- # awkward: cmd appends spaces to result
- lt_sed_strip_trailing_spaces="s/[ ]*\$//"
- func_to_host_path_tmp1=`( cmd //c echo "$1" |\
- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
- $SED -e "$lt_sed_naive_backslashify"`
- ;;
- *cygwin* )
- func_to_host_path_tmp1=`cygpath -w "$1"`
- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
- $SED -e "$lt_sed_naive_backslashify"`
- ;;
- * )
- # Unfortunately, winepath does not exit with a non-zero
- # error code, so we are forced to check the contents of
- # stdout. On the other hand, if the command is not
- # found, the shell will set an exit code of 127 and print
- # *an error message* to stdout. So we must check for both
- # error code of zero AND non-empty stdout, which explains
- # the odd construction:
- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
- $SED -e "$lt_sed_naive_backslashify"`
- else
- # Allow warning below.
- func_to_host_path_result=""
- fi
- ;;
- esac
- if test -z "$func_to_host_path_result" ; then
- func_error "Could not determine host path corresponding to"
- func_error " '$1'"
- func_error "Continuing, but uninstalled executables may not work."
- # Fallback:
- func_to_host_path_result="$1"
- fi
- ;;
- esac
- fi
-}
-# end: func_to_host_path
-
-# func_to_host_pathlist arg
-#
-# Convert pathlists to host format when used with build tools.
-# See func_to_host_path(), above. This function supports the
-# following $build/$host combinations (but does no harm for
-# combinations not listed here):
-# $build $host
-# mingw (msys) mingw [e.g. native]
-# cygwin mingw
-# *nix + wine mingw
-#
-# Path separators are also converted from $build format to
-# $host format. If ARG begins or ends with a path separator
-# character, it is preserved (but converted to $host format)
-# on output.
-#
-# ARG is a pathlist (on $build) that should be converted to
-# the proper representation on $host. The result is stored
-# in $func_to_host_pathlist_result.
-func_to_host_pathlist ()
-{
- func_to_host_pathlist_result="$1"
- if test -n "$1" ; then
- case $host in
- *mingw* )
- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
- # Remove leading and trailing path separator characters from
- # ARG. msys behavior is inconsistent here, cygpath turns them
- # into '.;' and ';.', and winepath ignores them completely.
- func_to_host_pathlist_tmp2="$1"
- # Once set for this call, this variable should not be
- # reassigned. It is used in tha fallback case.
- func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
- $SED -e 's|^:*||' -e 's|:*$||'`
- case $build in
- *mingw* ) # Actually, msys.
- # Awkward: cmd appends spaces to result.
- lt_sed_strip_trailing_spaces="s/[ ]*\$//"
- func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
- $SED -e "$lt_sed_naive_backslashify"`
- ;;
- *cygwin* )
- func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
- $SED -e "$lt_sed_naive_backslashify"`
- ;;
- * )
- # unfortunately, winepath doesn't convert pathlists
- func_to_host_pathlist_result=""
- func_to_host_pathlist_oldIFS=$IFS
- IFS=:
- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
- IFS=$func_to_host_pathlist_oldIFS
- if test -n "$func_to_host_pathlist_f" ; then
- func_to_host_path "$func_to_host_pathlist_f"
- if test -n "$func_to_host_path_result" ; then
- if test -z "$func_to_host_pathlist_result" ; then
- func_to_host_pathlist_result="$func_to_host_path_result"
- else
- func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
- fi
- fi
- fi
- IFS=:
- done
- IFS=$func_to_host_pathlist_oldIFS
- ;;
- esac
- if test -z "$func_to_host_pathlist_result" ; then
- func_error "Could not determine the host path(s) corresponding to"
- func_error " '$1'"
- func_error "Continuing, but uninstalled executables may not work."
- # Fallback. This may break if $1 contains DOS-style drive
- # specifications. The fix is not to complicate the expression
- # below, but for the user to provide a working wine installation
- # with winepath so that path translation in the cross-to-mingw
- # case works properly.
- lt_replace_pathsep_nix_to_dos="s|:|;|g"
- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
- $SED -e "$lt_replace_pathsep_nix_to_dos"`
- fi
- # Now, add the leading and trailing path separators back
- case "$1" in
- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
- ;;
- esac
- case "$1" in
- *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
- ;;
- esac
- ;;
- esac
+ \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+ exit 1
fi
+fi\
+"
}
-# end: func_to_host_pathlist
+
# func_emit_cwrapperexe_src
# emit the source code for a wrapper executable on stdout
@@ -3141,31 +4141,23 @@ func_emit_cwrapperexe_src ()
This wrapper executable should never be moved out of the build directory.
If it is, it will not operate correctly.
-
- Currently, it simply execs the wrapper *script* "$SHELL $output",
- but could eventually absorb all of the scripts functionality and
- exec $objdir/$outputname directly.
*/
EOF
cat <<"EOF"
+#ifdef _MSC_VER
+# define _CRT_SECURE_NO_DEPRECATE 1
+#endif
#include <stdio.h>
#include <stdlib.h>
#ifdef _MSC_VER
# include <direct.h>
# include <process.h>
# include <io.h>
-# define setmode _setmode
#else
# include <unistd.h>
# include <stdint.h>
# ifdef __CYGWIN__
# include <io.h>
-# define HAVE_SETENV
-# ifdef __STRICT_ANSI__
-char *realpath (const char *, char *);
-int putenv (char *);
-int setenv (const char *, const char *, int);
-# endif
# endif
#endif
#include <malloc.h>
@@ -3177,6 +4169,44 @@ int setenv (const char *, const char *,
#include <fcntl.h>
#include <sys/stat.h>
+/* declarations of non-ANSI functions */
+#if defined(__MINGW32__)
+# ifdef __STRICT_ANSI__
+int _putenv (const char *);
+# endif
+#elif defined(__CYGWIN__)
+# ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+# endif
+/* #elif defined (other platforms) ... */
+#endif
+
+/* portability defines, excluding path handling macros */
+#if defined(_MSC_VER)
+# define setmode _setmode
+# define stat _stat
+# define chmod _chmod
+# define getcwd _getcwd
+# define putenv _putenv
+# define S_IXUSR _S_IEXEC
+# ifndef _INTPTR_T_DEFINED
+# define _INTPTR_T_DEFINED
+# define intptr_t int
+# endif
+#elif defined(__MINGW32__)
+# define setmode _setmode
+# define stat _stat
+# define chmod _chmod
+# define getcwd _getcwd
+# define putenv _putenv
+#elif defined(__CYGWIN__)
+# define HAVE_SETENV
+# define FOPEN_WB "wb"
+/* #elif defined (other platforms) ... */
+#endif
+
#if defined(PATH_MAX)
# define LT_PATHMAX PATH_MAX
#elif defined(MAXPATHLEN)
@@ -3192,14 +4222,7 @@ int setenv (const char *, const char *,
# define S_IXGRP 0
#endif
-#ifdef _MSC_VER
-# define S_IXUSR _S_IEXEC
-# define stat _stat
-# ifndef _INTPTR_T_DEFINED
-# define intptr_t int
-# endif
-#endif
-
+/* path handling portability macros */
#ifndef DIR_SEPARATOR
# define DIR_SEPARATOR '/'
# define PATH_SEPARATOR ':'
@@ -3230,10 +4253,6 @@ int setenv (const char *, const char *,
# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
#endif /* PATH_SEPARATOR_2 */
-#ifdef __CYGWIN__
-# define FOPEN_WB "wb"
-#endif
-
#ifndef FOPEN_WB
# define FOPEN_WB "w"
#endif
@@ -3246,22 +4265,13 @@ int setenv (const char *, const char *,
if (stale) { free ((void *) stale); stale = 0; } \
} while (0)
-#undef LTWRAPPER_DEBUGPRINTF
-#if defined DEBUGWRAPPER
-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
-static void
-ltwrapper_debugprintf (const char *fmt, ...)
-{
- va_list args;
- va_start (args, fmt);
- (void) vfprintf (stderr, fmt, args);
- va_end (args);
-}
+#if defined(LT_DEBUGWRAPPER)
+static int lt_debug = 1;
#else
-# define LTWRAPPER_DEBUGPRINTF(args)
+static int lt_debug = 0;
#endif
-const char *program_name = NULL;
+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
void *xmalloc (size_t num);
char *xstrdup (const char *string);
@@ -3271,41 +4281,27 @@ char *chase_symlinks (const char *pathsp
int make_executable (const char *path);
int check_executable (const char *path);
char *strendzap (char *str, const char *pat);
-void lt_fatal (const char *message, ...);
+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
+void lt_fatal (const char *file, int line, const char *message, ...);
+static const char *nonnull (const char *s);
+static const char *nonempty (const char *s);
void lt_setenv (const char *name, const char *value);
char *lt_extend_str (const char *orig_value, const char *add, int to_end);
-void lt_opt_process_env_set (const char *arg);
-void lt_opt_process_env_prepend (const char *arg);
-void lt_opt_process_env_append (const char *arg);
-int lt_split_name_value (const char *arg, char** name, char** value);
void lt_update_exe_path (const char *name, const char *value);
void lt_update_lib_path (const char *name, const char *value);
-
-static const char *script_text_part1 =
-EOF
-
- func_emit_wrapper_part1 yes |
- $SED -e 's/\([\\"]\)/\\\1/g' \
- -e 's/^/ "/' -e 's/$/\\n"/'
- echo ";"
- cat <<EOF
-
-static const char *script_text_part2 =
+char **prepare_spawn (char **argv);
+void lt_dump_script (FILE *f);
EOF
- func_emit_wrapper_part2 yes |
- $SED -e 's/\([\\"]\)/\\\1/g' \
- -e 's/^/ "/' -e 's/$/\\n"/'
- echo ";"
cat <<EOF
-const char * MAGIC_EXE = "$magic_exe";
+volatile const char * MAGIC_EXE = "$magic_exe";
const char * LIB_PATH_VARNAME = "$shlibpath_var";
EOF
if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
- func_to_host_pathlist "$temp_rpath"
+ func_to_host_path "$temp_rpath"
cat <<EOF
-const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";
+const char * LIB_PATH_VALUE = "$func_to_host_path_result";
EOF
else
cat <<"EOF"
@@ -3314,10 +4310,10 @@ EOF
fi
if test -n "$dllsearchpath"; then
- func_to_host_pathlist "$dllsearchpath:"
+ func_to_host_path "$dllsearchpath:"
cat <<EOF
const char * EXE_PATH_VARNAME = "PATH";
-const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";
+const char * EXE_PATH_VALUE = "$func_to_host_path_result";
EOF
else
cat <<"EOF"
@@ -3340,24 +4336,10 @@ EOF
cat <<"EOF"
#define LTWRAPPER_OPTION_PREFIX "--lt-"
-#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
-static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
-
static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
-
-static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
-static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set";
- /* argument is putenv-style "foo=bar", value of foo is set to bar */
-
-static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
-static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend";
- /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
-
-static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
-static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append";
- /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
+static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
int
main (int argc, char *argv[])
@@ -3374,10 +4356,13 @@ main (int argc, char *argv[])
int i;
program_name = (char *) xstrdup (base_name (argv[0]));
- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
+ newargz = XMALLOC (char *, argc + 1);
- /* very simple arg parsing; don't want to rely on getopt */
+ /* very simple arg parsing; don't want to rely on getopt
+ * also, copy all non cwrapper options to newargz, except
+ * argz[0], which is handled differently
+ */
+ newargc=0;
for (i = 1; i < argc; i++)
{
if (strcmp (argv[i], dumpscript_opt) == 0)
@@ -3391,25 +4376,57 @@ EOF
esac
cat <<"EOF"
- printf ("%s", script_text_part1);
- printf ("%s", script_text_part2);
+ lt_dump_script (stdout);
return 0;
}
+ if (strcmp (argv[i], debug_opt) == 0)
+ {
+ lt_debug = 1;
+ continue;
+ }
+ if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
+ {
+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+ namespace, but it is not one of the ones we know about and
+ have already dealt with, above (inluding dump-script), then
+ report an error. Otherwise, targets might begin to believe
+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+ namespace. The first time any user complains about this, we'll
+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+ or a configure.ac-settable value.
+ */
+ lt_fatal (__FILE__, __LINE__,
+ "unrecognized %s option: '%s'",
+ ltwrapper_option_prefix, argv[i]);
+ }
+ /* otherwise ... */
+ newargz[++newargc] = xstrdup (argv[i]);
}
+ newargz[++newargc] = NULL;
+
+EOF
+ cat <<EOF
+ /* The GNU banner must be the first non-error debug message */
+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
+EOF
+ cat <<"EOF"
+ lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
+ lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
- newargz = XMALLOC (char *, argc + 1);
tmp_pathspec = find_executable (argv[0]);
if (tmp_pathspec == NULL)
- lt_fatal ("Couldn't find %s", argv[0]);
- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
- tmp_pathspec));
+ lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
+ lt_debugprintf (__FILE__, __LINE__,
+ "(main) found exe (before symlink chase) at: %s\n",
+ tmp_pathspec);
actual_cwrapper_path = chase_symlinks (tmp_pathspec);
- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
- actual_cwrapper_path));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(main) found exe (after symlink chase) at: %s\n",
+ actual_cwrapper_path);
XFREE (tmp_pathspec);
- actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
+ actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
strendzap (actual_cwrapper_path, actual_cwrapper_name);
/* wrapper name transforms */
@@ -3427,8 +4444,9 @@ EOF
target_name = tmp_pathspec;
tmp_pathspec = 0;
- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
- target_name));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(main) libtool target name: %s\n",
+ target_name);
EOF
cat <<EOF
@@ -3478,80 +4496,19 @@ EOF
lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
lt_setenv ("DUALCASE", "1"); /* for MSK sh */
- lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+ /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must
+ be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
+ because on Windows, both *_VARNAMEs are PATH but uninstalled
+ libraries must come first. */
lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
- newargc=0;
- for (i = 1; i < argc; i++)
- {
- if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
- {
- if (argv[i][env_set_opt_len] == '=')
- {
- const char *p = argv[i] + env_set_opt_len + 1;
- lt_opt_process_env_set (p);
- }
- else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
- {
- lt_opt_process_env_set (argv[++i]); /* don't copy */
- }
- else
- lt_fatal ("%s missing required argument", env_set_opt);
- continue;
- }
- if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
- {
- if (argv[i][env_prepend_opt_len] == '=')
- {
- const char *p = argv[i] + env_prepend_opt_len + 1;
- lt_opt_process_env_prepend (p);
- }
- else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
- {
- lt_opt_process_env_prepend (argv[++i]); /* don't copy */
- }
- else
- lt_fatal ("%s missing required argument", env_prepend_opt);
- continue;
- }
- if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
- {
- if (argv[i][env_append_opt_len] == '=')
- {
- const char *p = argv[i] + env_append_opt_len + 1;
- lt_opt_process_env_append (p);
- }
- else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
- {
- lt_opt_process_env_append (argv[++i]); /* don't copy */
- }
- else
- lt_fatal ("%s missing required argument", env_append_opt);
- continue;
- }
- if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
- {
- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
- namespace, but it is not one of the ones we know about and
- have already dealt with, above (inluding dump-script), then
- report an error. Otherwise, targets might begin to believe
- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
- namespace. The first time any user complains about this, we'll
- need to make LTWRAPPER_OPTION_PREFIX a configure-time option
- or a configure.ac-settable value.
- */
- lt_fatal ("Unrecognized option in %s namespace: '%s'",
- ltwrapper_option_prefix, argv[i]);
- }
- /* otherwise ... */
- newargz[++newargc] = xstrdup (argv[i]);
- }
- newargz[++newargc] = NULL;
-
- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
+ nonnull (lt_argv_zero));
for (i = 0; i < newargc; i++)
{
- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
+ i, nonnull (newargz[i]));
}
EOF
@@ -3560,11 +4517,14 @@ EOF
mingw*)
cat <<"EOF"
/* execv doesn't actually work on mingw as expected on unix */
+ newargz = prepare_spawn (newargz);
rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
if (rval == -1)
{
/* failed to start process */
- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(main) failed to launch target \"%s\": %s\n",
+ lt_argv_zero, nonnull (strerror (errno)));
return 127;
}
return rval;
@@ -3586,7 +4546,7 @@ xmalloc (size_t num)
{
void *p = (void *) malloc (num);
if (!p)
- lt_fatal ("Memory exhausted");
+ lt_fatal (__FILE__, __LINE__, "memory exhausted");
return p;
}
@@ -3620,8 +4580,8 @@ check_executable (const char *path)
{
struct stat st;
- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
- path ? (*path ? path : "EMPTY!") : "NULL!"));
+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
+ nonempty (path));
if ((!path) || (!*path))
return 0;
@@ -3638,8 +4598,8 @@ make_executable (const char *path)
int rval = 0;
struct stat st;
- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
- path ? (*path ? path : "EMPTY!") : "NULL!"));
+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
+ nonempty (path));
if ((!path) || (!*path))
return 0;
@@ -3665,8 +4625,8 @@ find_executable (const char *wrapper)
int tmp_len;
char *concat_name;
- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
+ nonempty (wrapper));
if ((wrapper == NULL) || (*wrapper == '\0'))
return NULL;
@@ -3719,7 +4679,8 @@ find_executable (const char *wrapper)
{
/* empty path: current directory */
if (getcwd (tmp, LT_PATHMAX) == NULL)
- lt_fatal ("getcwd failed");
+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+ nonnull (strerror (errno)));
tmp_len = strlen (tmp);
concat_name =
XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
@@ -3744,7 +4705,8 @@ find_executable (const char *wrapper)
}
/* Relative path | not found in path: prepend cwd */
if (getcwd (tmp, LT_PATHMAX) == NULL)
- lt_fatal ("getcwd failed");
+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+ nonnull (strerror (errno)));
tmp_len = strlen (tmp);
concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
memcpy (concat_name, tmp, tmp_len);
@@ -3770,8 +4732,9 @@ chase_symlinks (const char *pathspec)
int has_symlinks = 0;
while (strlen (tmp_pathspec) && !has_symlinks)
{
- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
- tmp_pathspec));
+ lt_debugprintf (__FILE__, __LINE__,
+ "checking path component for symlinks: %s\n",
+ tmp_pathspec);
if (lstat (tmp_pathspec, &s) == 0)
{
if (S_ISLNK (s.st_mode) != 0)
@@ -3793,8 +4756,9 @@ chase_symlinks (const char *pathspec)
}
else
{
- char *errstr = strerror (errno);
- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
+ lt_fatal (__FILE__, __LINE__,
+ "error accessing file \"%s\": %s",
+ tmp_pathspec, nonnull (strerror (errno)));
}
}
XFREE (tmp_pathspec);
@@ -3807,7 +4771,8 @@ chase_symlinks (const char *pathspec)
tmp_pathspec = realpath (pathspec, buf);
if (tmp_pathspec == 0)
{
- lt_fatal ("Could not follow symlinks for %s", pathspec);
+ lt_fatal (__FILE__, __LINE__,
+ "could not follow symlinks for %s", pathspec);
}
return xstrdup (tmp_pathspec);
#endif
@@ -3833,11 +4798,25 @@ strendzap (char *str, const char *pat)
return str;
}
+void
+lt_debugprintf (const char *file, int line, const char *fmt, ...)
+{
+ va_list args;
+ if (lt_debug)
+ {
+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
+ va_start (args, fmt);
+ (void) vfprintf (stderr, fmt, args);
+ va_end (args);
+ }
+}
+
static void
-lt_error_core (int exit_status, const char *mode,
+lt_error_core (int exit_status, const char *file,
+ int line, const char *mode,
const char *message, va_list ap)
{
- fprintf (stderr, "%s: %s: ", program_name, mode);
+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
vfprintf (stderr, message, ap);
fprintf (stderr, ".\n");
@@ -3846,20 +4825,32 @@ lt_error_core (int exit_status, const ch
}
void
-lt_fatal (const char *message, ...)
+lt_fatal (const char *file, int line, const char *message, ...)
{
va_list ap;
va_start (ap, message);
- lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
va_end (ap);
}
+static const char *
+nonnull (const char *s)
+{
+ return s ? s : "(null)";
+}
+
+static const char *
+nonempty (const char *s)
+{
+ return (s && !*s) ? "(empty)" : nonnull (s);
+}
+
void
lt_setenv (const char *name, const char *value)
{
- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
- (name ? name : "<NULL>"),
- (value ? value : "<NULL>")));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(lt_setenv) setting '%s' to '%s'\n",
+ nonnull (name), nonnull (value));
{
#ifdef HAVE_SETENV
/* always make a copy, for consistency with !HAVE_SETENV */
@@ -3904,95 +4895,12 @@ lt_extend_str (const char *orig_value, c
return new_value;
}
-int
-lt_split_name_value (const char *arg, char** name, char** value)
-{
- const char *p;
- int len;
- if (!arg || !*arg)
- return 1;
-
- p = strchr (arg, (int)'=');
-
- if (!p)
- return 1;
-
- *value = xstrdup (++p);
-
- len = strlen (arg) - strlen (*value);
- *name = XMALLOC (char, len);
- strncpy (*name, arg, len-1);
- (*name)[len - 1] = '\0';
-
- return 0;
-}
-
-void
-lt_opt_process_env_set (const char *arg)
-{
- char *name = NULL;
- char *value = NULL;
-
- if (lt_split_name_value (arg, &name, &value) != 0)
- {
- XFREE (name);
- XFREE (value);
- lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
- }
-
- lt_setenv (name, value);
- XFREE (name);
- XFREE (value);
-}
-
-void
-lt_opt_process_env_prepend (const char *arg)
-{
- char *name = NULL;
- char *value = NULL;
- char *new_value = NULL;
-
- if (lt_split_name_value (arg, &name, &value) != 0)
- {
- XFREE (name);
- XFREE (value);
- lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
- }
-
- new_value = lt_extend_str (getenv (name), value, 0);
- lt_setenv (name, new_value);
- XFREE (new_value);
- XFREE (name);
- XFREE (value);
-}
-
-void
-lt_opt_process_env_append (const char *arg)
-{
- char *name = NULL;
- char *value = NULL;
- char *new_value = NULL;
-
- if (lt_split_name_value (arg, &name, &value) != 0)
- {
- XFREE (name);
- XFREE (value);
- lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
- }
-
- new_value = lt_extend_str (getenv (name), value, 1);
- lt_setenv (name, new_value);
- XFREE (new_value);
- XFREE (name);
- XFREE (value);
-}
-
void
lt_update_exe_path (const char *name, const char *value)
{
- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
- (name ? name : "<NULL>"),
- (value ? value : "<NULL>")));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+ nonnull (name), nonnull (value));
if (name && *name && value && *value)
{
@@ -4011,9 +4919,9 @@ lt_update_exe_path (const char *name, co
void
lt_update_lib_path (const char *name, const char *value)
{
- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
- (name ? name : "<NULL>"),
- (value ? value : "<NULL>")));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+ nonnull (name), nonnull (value));
if (name && *name && value && *value)
{
@@ -4023,11 +4931,152 @@ lt_update_lib_path (const char *name, co
}
}
+EOF
+ case $host_os in
+ mingw*)
+ cat <<"EOF"
+
+/* Prepares an argument vector before calling spawn().
+ Note that spawn() does not by itself call the command interpreter
+ (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
+ ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+ GetVersionEx(&v);
+ v.dwPlatformId == VER_PLATFORM_WIN32_NT;
+ }) ? "cmd.exe" : "command.com").
+ Instead it simply concatenates the arguments, separated by ' ', and calls
+ CreateProcess(). We must quote the arguments since Win32 CreateProcess()
+ interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
+ special way:
+ - Space and tab are interpreted as delimiters. They are not treated as
+ delimiters if they are surrounded by double quotes: "...".
+ - Unescaped double quotes are removed from the input. Their only effect is
+ that within double quotes, space and tab are treated like normal
+ characters.
+ - Backslashes not followed by double quotes are not special.
+ - But 2*n+1 backslashes followed by a double quote become
+ n backslashes followed by a double quote (n >= 0):
+ \" -> "
+ \\\" -> \"
+ \\\\\" -> \\"
+ */
+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+char **
+prepare_spawn (char **argv)
+{
+ size_t argc;
+ char **new_argv;
+ size_t i;
+
+ /* Count number of arguments. */
+ for (argc = 0; argv[argc] != NULL; argc++)
+ ;
+
+ /* Allocate new argument vector. */
+ new_argv = XMALLOC (char *, argc + 1);
+
+ /* Put quoted arguments into the new argument vector. */
+ for (i = 0; i < argc; i++)
+ {
+ const char *string = argv[i];
+
+ if (string[0] == '\0')
+ new_argv[i] = xstrdup ("\"\"");
+ else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
+ {
+ int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
+ size_t length;
+ unsigned int backslashes;
+ const char *s;
+ char *quoted_string;
+ char *p;
+
+ length = 0;
+ backslashes = 0;
+ if (quote_around)
+ length++;
+ for (s = string; *s != '\0'; s++)
+ {
+ char c = *s;
+ if (c == '"')
+ length += backslashes + 1;
+ length++;
+ if (c == '\\')
+ backslashes++;
+ else
+ backslashes = 0;
+ }
+ if (quote_around)
+ length += backslashes + 1;
+
+ quoted_string = XMALLOC (char, length + 1);
+
+ p = quoted_string;
+ backslashes = 0;
+ if (quote_around)
+ *p++ = '"';
+ for (s = string; *s != '\0'; s++)
+ {
+ char c = *s;
+ if (c == '"')
+ {
+ unsigned int j;
+ for (j = backslashes + 1; j > 0; j--)
+ *p++ = '\\';
+ }
+ *p++ = c;
+ if (c == '\\')
+ backslashes++;
+ else
+ backslashes = 0;
+ }
+ if (quote_around)
+ {
+ unsigned int j;
+ for (j = backslashes; j > 0; j--)
+ *p++ = '\\';
+ *p++ = '"';
+ }
+ *p = '\0';
+
+ new_argv[i] = quoted_string;
+ }
+ else
+ new_argv[i] = (char *) string;
+ }
+ new_argv[argc] = NULL;
+
+ return new_argv;
+}
+EOF
+ ;;
+ esac
+
+ cat <<"EOF"
+void lt_dump_script (FILE* f)
+{
+EOF
+ func_emit_wrapper yes |
+ $SED -e 's/\([\\"]\)/\\\1/g' \
+ -e 's/^/ fputs ("/' -e 's/$/\\n", f);/'
+ cat <<"EOF"
+}
EOF
}
# end: func_emit_cwrapperexe_src
+# func_win32_import_lib_p ARG
+# True if ARG is an import lib, as indicated by $file_magic_cmd
+func_win32_import_lib_p ()
+{
+ $opt_debug
+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
+ *import*) : ;;
+ *) false ;;
+ esac
+}
+
# func_mode_link arg...
func_mode_link ()
{
@@ -4072,6 +5121,7 @@ func_mode_link ()
new_inherited_linker_flags=
avoid_version=no
+ bindir=
dlfiles=
dlprefiles=
dlself=no
@@ -4164,6 +5214,11 @@ func_mode_link ()
esac
case $prev in
+ bindir)
+ bindir="$arg"
+ prev=
+ continue
+ ;;
dlfiles|dlprefiles)
if test "$preload" = no; then
# Add the symbol object into the linking commands.
@@ -4195,9 +5250,9 @@ func_mode_link ()
;;
*)
if test "$prev" = dlfiles; then
- dlfiles="$dlfiles $arg"
+ func_append dlfiles " $arg"
else
- dlprefiles="$dlprefiles $arg"
+ func_append dlprefiles " $arg"
fi
prev=
continue
@@ -4221,7 +5276,7 @@ func_mode_link ()
*-*-darwin*)
case "$deplibs " in
*" $qarg.ltframework "*) ;;
- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+ *) func_append deplibs " $qarg.ltframework" # this is fixed later
;;
esac
;;
@@ -4240,7 +5295,7 @@ func_mode_link ()
moreargs=
for fil in `cat "$save_arg"`
do
-# moreargs="$moreargs $fil"
+# func_append moreargs " $fil"
arg=$fil
# A libtool-controlled object.
@@ -4269,7 +5324,7 @@ func_mode_link ()
if test "$prev" = dlfiles; then
if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
- dlfiles="$dlfiles $pic_object"
+ func_append dlfiles " $pic_object"
prev=
continue
else
@@ -4281,7 +5336,7 @@ func_mode_link ()
# CHECK ME: I think I busted this. -Ossama
if test "$prev" = dlprefiles; then
# Preload the old-style object.
- dlprefiles="$dlprefiles $pic_object"
+ func_append dlprefiles " $pic_object"
prev=
fi
@@ -4351,12 +5406,12 @@ func_mode_link ()
if test "$prev" = rpath; then
case "$rpath " in
*" $arg "*) ;;
- *) rpath="$rpath $arg" ;;
+ *) func_append rpath " $arg" ;;
esac
else
case "$xrpath " in
*" $arg "*) ;;
- *) xrpath="$xrpath $arg" ;;
+ *) func_append xrpath " $arg" ;;
esac
fi
prev=
@@ -4368,28 +5423,28 @@ func_mode_link ()
continue
;;
weak)
- weak_libs="$weak_libs $arg"
+ func_append weak_libs " $arg"
prev=
continue
;;
xcclinker)
- linker_flags="$linker_flags $qarg"
- compiler_flags="$compiler_flags $qarg"
+ func_append linker_flags " $qarg"
+ func_append compiler_flags " $qarg"
prev=
func_append compile_command " $qarg"
func_append finalize_command " $qarg"
continue
;;
xcompiler)
- compiler_flags="$compiler_flags $qarg"
+ func_append compiler_flags " $qarg"
prev=
func_append compile_command " $qarg"
func_append finalize_command " $qarg"
continue
;;
xlinker)
- linker_flags="$linker_flags $qarg"
- compiler_flags="$compiler_flags $wl$qarg"
+ func_append linker_flags " $qarg"
+ func_append compiler_flags " $wl$qarg"
prev=
func_append compile_command " $wl$qarg"
func_append finalize_command " $wl$qarg"
@@ -4425,6 +5480,11 @@ func_mode_link ()
continue
;;
+ -bindir)
+ prev=bindir
+ continue
+ ;;
+
-dlopen)
prev=dlfiles
continue
@@ -4475,15 +5535,16 @@ func_mode_link ()
;;
-L*)
- func_stripname '-L' '' "$arg"
- dir=$func_stripname_result
- if test -z "$dir"; then
+ func_stripname "-L" '' "$arg"
+ if test -z "$func_stripname_result"; then
if test "$#" -gt 0; then
func_fatal_error "require no space between \`-L' and \`$1'"
else
func_fatal_error "need path for \`-L' option"
fi
fi
+ func_resolve_sysroot "$func_stripname_result"
+ dir=$func_resolve_sysroot_result
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
@@ -4495,24 +5556,30 @@ func_mode_link ()
;;
esac
case "$deplibs " in
- *" -L$dir "*) ;;
+ *" -L$dir "* | *" $arg "*)
+ # Will only happen for absolute or sysroot arguments
+ ;;
*)
- deplibs="$deplibs -L$dir"
- lib_search_path="$lib_search_path $dir"
+ # Preserve sysroot, but never include relative directories
+ case $dir in
+ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
+ *) func_append deplibs " -L$dir" ;;
+ esac
+ func_append lib_search_path " $dir"
;;
esac
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
- testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+ testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$dir:"*) ;;
::) dllsearchpath=$dir;;
- *) dllsearchpath="$dllsearchpath:$dir";;
+ *) func_append dllsearchpath ":$dir";;
esac
case :$dllsearchpath: in
*":$testbindir:"*) ;;
::) dllsearchpath=$testbindir;;
- *) dllsearchpath="$dllsearchpath:$testbindir";;
+ *) func_append dllsearchpath ":$testbindir";;
esac
;;
esac
@@ -4522,7 +5589,7 @@ func_mode_link ()
-l*)
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
# These systems don't actually have a C or math library (as such)
continue
;;
@@ -4536,7 +5603,7 @@ func_mode_link ()
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C and math libraries are in the System framework
- deplibs="$deplibs System.ltframework"
+ func_append deplibs " System.ltframework"
continue
;;
*-*-sco3.2v5* | *-*-sco5v6*)
@@ -4556,7 +5623,7 @@ func_mode_link ()
;;
esac
fi
- deplibs="$deplibs $arg"
+ func_append deplibs " $arg"
continue
;;
@@ -4568,8 +5635,8 @@ func_mode_link ()
# Tru64 UNIX uses -model [arg] to determine the layout of C++
# classes, name mangling, and exception handling.
# Darwin uses the -arch flag to determine output architecture.
- -model|-arch|-isysroot)
- compiler_flags="$compiler_flags $arg"
+ -model|-arch|-isysroot|--sysroot)
+ func_append compiler_flags " $arg"
func_append compile_command " $arg"
func_append finalize_command " $arg"
prev=xcompiler
@@ -4577,12 +5644,12 @@ func_mode_link ()
;;
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- compiler_flags="$compiler_flags $arg"
+ func_append compiler_flags " $arg"
func_append compile_command " $arg"
func_append finalize_command " $arg"
case "$new_inherited_linker_flags " in
*" $arg "*) ;;
- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
+ * ) func_append new_inherited_linker_flags " $arg" ;;
esac
continue
;;
@@ -4649,13 +5716,17 @@ func_mode_link ()
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
+ =*)
+ func_stripname '=' '' "$dir"
+ dir=$lt_sysroot$func_stripname_result
+ ;;
*)
func_fatal_error "only absolute run-paths are allowed"
;;
esac
case "$xrpath " in
*" $dir "*) ;;
- *) xrpath="$xrpath $dir" ;;
+ *) func_append xrpath " $dir" ;;
esac
continue
;;
@@ -4708,8 +5779,8 @@ func_mode_link ()
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
- arg="$arg $wl$func_quote_for_eval_result"
- compiler_flags="$compiler_flags $func_quote_for_eval_result"
+ func_append arg " $func_quote_for_eval_result"
+ func_append compiler_flags " $func_quote_for_eval_result"
done
IFS="$save_ifs"
func_stripname ' ' '' "$arg"
@@ -4724,9 +5795,9 @@ func_mode_link ()
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
- arg="$arg $wl$func_quote_for_eval_result"
- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
- linker_flags="$linker_flags $func_quote_for_eval_result"
+ func_append arg " $wl$func_quote_for_eval_result"
+ func_append compiler_flags " $wl$func_quote_for_eval_result"
+ func_append linker_flags " $func_quote_for_eval_result"
done
IFS="$save_ifs"
func_stripname ' ' '' "$arg"
@@ -4754,23 +5825,27 @@ func_mode_link ()
arg="$func_quote_for_eval_result"
;;
- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
- # -r[0-9][0-9]* specifies the processor on the SGI compiler
- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
- # +DA*, +DD* enable 64-bit mode on the HP compiler
- # -q* pass through compiler args for the IBM compiler
- # -m*, -t[45]*, -txscale* pass through architecture-specific
- # compiler args for GCC
- # -F/path gives path to uninstalled frameworks, gcc on darwin
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # @file GCC response files
+ # Flags to be passed through unchanged, with rationale:
+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
+ # -r[0-9][0-9]* specify processor for the SGI compiler
+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
+ # +DA*, +DD* enable 64-bit mode for the HP compiler
+ # -q* compiler args for the IBM compiler
+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
+ # -F/path path to uninstalled frameworks, gcc on darwin
+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
+ # @file GCC response files
+ # -tp=* Portland pgcc target processor selection
+ # --sysroot=* for sysroot support
+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
func_quote_for_eval "$arg"
arg="$func_quote_for_eval_result"
func_append compile_command " $arg"
func_append finalize_command " $arg"
- compiler_flags="$compiler_flags $arg"
+ func_append compiler_flags " $arg"
continue
;;
@@ -4782,7 +5857,7 @@ func_mode_link ()
*.$objext)
# A standard object.
- objs="$objs $arg"
+ func_append objs " $arg"
;;
*.lo)
@@ -4813,7 +5888,7 @@ func_mode_link ()
if test "$prev" = dlfiles; then
if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
- dlfiles="$dlfiles $pic_object"
+ func_append dlfiles " $pic_object"
prev=
continue
else
@@ -4825,7 +5900,7 @@ func_mode_link ()
# CHECK ME: I think I busted this. -Ossama
if test "$prev" = dlprefiles; then
# Preload the old-style object.
- dlprefiles="$dlprefiles $pic_object"
+ func_append dlprefiles " $pic_object"
prev=
fi
@@ -4870,24 +5945,25 @@ func_mode_link ()
*.$libext)
# An archive.
- deplibs="$deplibs $arg"
- old_deplibs="$old_deplibs $arg"
+ func_append deplibs " $arg"
+ func_append old_deplibs " $arg"
continue
;;
*.la)
# A libtool-controlled library.
+ func_resolve_sysroot "$arg"
if test "$prev" = dlfiles; then
# This library was specified with -dlopen.
- dlfiles="$dlfiles $arg"
+ func_append dlfiles " $func_resolve_sysroot_result"
prev=
elif test "$prev" = dlprefiles; then
# The library was specified with -dlpreopen.
- dlprefiles="$dlprefiles $arg"
+ func_append dlprefiles " $func_resolve_sysroot_result"
prev=
else
- deplibs="$deplibs $arg"
+ func_append deplibs " $func_resolve_sysroot_result"
fi
continue
;;
@@ -4925,7 +6001,7 @@ func_mode_link ()
if test -n "$shlibpath_var"; then
# get the directories listed in $shlibpath_var
- eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+ eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
else
shlib_search_path=
fi
@@ -4934,6 +6010,8 @@ func_mode_link ()
func_dirname "$output" "/" ""
output_objdir="$func_dirname_result$objdir"
+ func_to_tool_file "$output_objdir/"
+ tool_output_objdir=$func_to_tool_file_result
# Create the object directory.
func_mkdir_p "$output_objdir"
@@ -4954,12 +6032,12 @@ func_mode_link ()
# Find all interdependent deplibs by searching for libraries
# that are linked more than once (e.g. -la -lb -la)
for deplib in $deplibs; do
- if $opt_duplicate_deps ; then
+ if $opt_preserve_dup_deps ; then
case "$libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
fi
- libs="$libs $deplib"
+ func_append libs " $deplib"
done
if test "$linkmode" = lib; then
@@ -4972,9 +6050,9 @@ func_mode_link ()
if $opt_duplicate_compiler_generated_deps; then
for pre_post_dep in $predeps $postdeps; do
case "$pre_post_deps " in
- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
esac
- pre_post_deps="$pre_post_deps $pre_post_dep"
+ func_append pre_post_deps " $pre_post_dep"
done
fi
pre_post_deps=
@@ -5044,17 +6122,19 @@ func_mode_link ()
for lib in $dlprefiles; do
# Ignore non-libtool-libs
dependency_libs=
+ func_resolve_sysroot "$lib"
case $lib in
- *.la) func_source "$lib" ;;
+ *.la) func_source "$func_resolve_sysroot_result" ;;
esac
# Collect preopened libtool deplibs, except any this library
# has declared as weak libs
for deplib in $dependency_libs; do
- deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
+ func_basename "$deplib"
+ deplib_base=$func_basename_result
case " $weak_libs " in
*" $deplib_base "*) ;;
- *) deplibs="$deplibs $deplib" ;;
+ *) func_append deplibs " $deplib" ;;
esac
done
done
@@ -5075,11 +6155,11 @@ func_mode_link ()
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
- compiler_flags="$compiler_flags $deplib"
+ func_append compiler_flags " $deplib"
if test "$linkmode" = lib ; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+ * ) func_append new_inherited_linker_flags " $deplib" ;;
esac
fi
fi
@@ -5164,7 +6244,7 @@ func_mode_link ()
if test "$linkmode" = lib ; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+ * ) func_append new_inherited_linker_flags " $deplib" ;;
esac
fi
fi
@@ -5177,7 +6257,8 @@ func_mode_link ()
test "$pass" = conv && continue
newdependency_libs="$deplib $newdependency_libs"
func_stripname '-L' '' "$deplib"
- newlib_search_path="$newlib_search_path $func_stripname_result"
+ func_resolve_sysroot "$func_stripname_result"
+ func_append newlib_search_path " $func_resolve_sysroot_result"
;;
prog)
if test "$pass" = conv; then
@@ -5191,7 +6272,8 @@ func_mode_link ()
finalize_deplibs="$deplib $finalize_deplibs"
fi
func_stripname '-L' '' "$deplib"
- newlib_search_path="$newlib_search_path $func_stripname_result"
+ func_resolve_sysroot "$func_stripname_result"
+ func_append newlib_search_path " $func_resolve_sysroot_result"
;;
*)
func_warning "\`-L' is ignored for archives/objects"
@@ -5202,17 +6284,21 @@ func_mode_link ()
-R*)
if test "$pass" = link; then
func_stripname '-R' '' "$deplib"
- dir=$func_stripname_result
+ func_resolve_sysroot "$func_stripname_result"
+ dir=$func_resolve_sysroot_result
# Make sure the xrpath contains only unique directories.
case "$xrpath " in
*" $dir "*) ;;
- *) xrpath="$xrpath $dir" ;;
+ *) func_append xrpath " $dir" ;;
esac
fi
deplibs="$deplib $deplibs"
continue
;;
- *.la) lib="$deplib" ;;
+ *.la)
+ func_resolve_sysroot "$deplib"
+ lib=$func_resolve_sysroot_result
+ ;;
*.$libext)
if test "$pass" = conv; then
deplibs="$deplib $deplibs"
@@ -5230,7 +6316,7 @@ func_mode_link ()
match_pattern*)
set dummy $deplibs_check_method; shift
match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
- if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
+ if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
| $EGREP "$match_pattern_regex" > /dev/null; then
valid_a_lib=yes
fi
@@ -5240,15 +6326,15 @@ func_mode_link ()
;;
esac
if test "$valid_a_lib" != yes; then
- $ECHO
+ echo
$ECHO "*** Warning: Trying to link with static lib archive $deplib."
- $ECHO "*** I have the capability to make that library automatically link in when"
- $ECHO "*** you link to this library. But I can only do this if you have a"
- $ECHO "*** shared version of the library, which you do not appear to have"
- $ECHO "*** because the file extensions .$libext of this argument makes me believe"
- $ECHO "*** that it is just a static archive that I should not use here."
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have"
+ echo "*** because the file extensions .$libext of this argument makes me believe"
+ echo "*** that it is just a static archive that I should not use here."
else
- $ECHO
+ echo
$ECHO "*** Warning: Linking the shared library $output against the"
$ECHO "*** static library $deplib is not portable!"
deplibs="$deplib $deplibs"
@@ -5275,11 +6361,11 @@ func_mode_link ()
if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
# If there is no dlopen support or we're linking statically,
# we need to preload.
- newdlprefiles="$newdlprefiles $deplib"
+ func_append newdlprefiles " $deplib"
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
- newdlfiles="$newdlfiles $deplib"
+ func_append newdlfiles " $deplib"
fi
fi
continue
@@ -5321,20 +6407,20 @@ func_mode_link ()
# Convert "-framework foo" to "foo.ltframework"
if test -n "$inherited_linker_flags"; then
- tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
+ tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
case " $new_inherited_linker_flags " in
*" $tmp_inherited_linker_flag "*) ;;
- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
esac
done
fi
- dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan" ||
{ test "$linkmode" != prog && test "$linkmode" != lib; }; then
- test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+ test -n "$dlopen" && func_append dlfiles " $dlopen"
+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
fi
if test "$pass" = conv; then
@@ -5345,17 +6431,17 @@ func_mode_link ()
func_fatal_error "cannot find name of link library for \`$lib'"
fi
# It is a libtool convenience library, so add in its objects.
- convenience="$convenience $ladir/$objdir/$old_library"
- old_convenience="$old_convenience $ladir/$objdir/$old_library"
+ func_append convenience " $ladir/$objdir/$old_library"
+ func_append old_convenience " $ladir/$objdir/$old_library"
tmp_libs=
for deplib in $dependency_libs; do
deplibs="$deplib $deplibs"
- if $opt_duplicate_deps ; then
+ if $opt_preserve_dup_deps ; then
case "$tmp_libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
fi
- tmp_libs="$tmp_libs $deplib"
+ func_append tmp_libs " $deplib"
done
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
@@ -5366,9 +6452,15 @@ func_mode_link ()
# Get the name of the library we link against.
linklib=
- for l in $old_library $library_names; do
- linklib="$l"
- done
+ if test -n "$old_library" &&
+ { test "$prefer_static_libs" = yes ||
+ test "$prefer_static_libs,$installed" = "built,no"; }; then
+ linklib=$old_library
+ else
+ for l in $old_library $library_names; do
+ linklib="$l"
+ done
+ fi
if test -z "$linklib"; then
func_fatal_error "cannot find name of link library for \`$lib'"
fi
@@ -5385,9 +6477,9 @@ func_mode_link ()
# statically, we need to preload. We also need to preload any
# dependent libraries so libltdl's deplib preloader doesn't
# bomb out in the load deplibs phase.
- dlprefiles="$dlprefiles $lib $dependency_libs"
+ func_append dlprefiles " $lib $dependency_libs"
else
- newdlfiles="$newdlfiles $lib"
+ func_append newdlfiles " $lib"
fi
continue
fi # $pass = dlopen
@@ -5409,14 +6501,14 @@ func_mode_link ()
# Find the relevant object directory and library name.
if test "X$installed" = Xyes; then
- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
func_warning "library \`$lib' was moved."
dir="$ladir"
absdir="$abs_ladir"
libdir="$abs_ladir"
else
- dir="$libdir"
- absdir="$libdir"
+ dir="$lt_sysroot$libdir"
+ absdir="$lt_sysroot$libdir"
fi
test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
else
@@ -5424,12 +6516,12 @@ func_mode_link ()
dir="$ladir"
absdir="$abs_ladir"
# Remove this search path later
- notinst_path="$notinst_path $abs_ladir"
+ func_append notinst_path " $abs_ladir"
else
dir="$ladir/$objdir"
absdir="$abs_ladir/$objdir"
# Remove this search path later
- notinst_path="$notinst_path $abs_ladir"
+ func_append notinst_path " $abs_ladir"
fi
fi # $installed = yes
func_stripname 'lib' '.la' "$laname"
@@ -5440,20 +6532,46 @@ func_mode_link ()
if test -z "$libdir" && test "$linkmode" = prog; then
func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
fi
- # Prefer using a static library (so that no silly _DYNAMIC symbols
- # are required to link).
- if test -n "$old_library"; then
- newdlprefiles="$newdlprefiles $dir/$old_library"
- # Keep a list of preopened convenience libraries to check
- # that they are being used correctly in the link pass.
- test -z "$libdir" && \
- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
- # Otherwise, use the dlname, so that lt_dlopen finds it.
- elif test -n "$dlname"; then
- newdlprefiles="$newdlprefiles $dir/$dlname"
- else
- newdlprefiles="$newdlprefiles $dir/$linklib"
- fi
+ case "$host" in
+ # special handling for platforms with PE-DLLs.
+ *cygwin* | *mingw* | *cegcc* )
+ # Linker will automatically link against shared library if both
+ # static and shared are present. Therefore, ensure we extract
+ # symbols from the import library if a shared library is present
+ # (otherwise, the dlopen module name will be incorrect). We do
+ # this by putting the import library name into $newdlprefiles.
+ # We recover the dlopen module name by 'saving' the la file
+ # name in a special purpose variable, and (later) extracting the
+ # dlname from the la file.
+ if test -n "$dlname"; then
+ func_tr_sh "$dir/$linklib"
+ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
+ func_append newdlprefiles " $dir/$linklib"
+ else
+ func_append newdlprefiles " $dir/$old_library"
+ # Keep a list of preopened convenience libraries to check
+ # that they are being used correctly in the link pass.
+ test -z "$libdir" && \
+ func_append dlpreconveniencelibs " $dir/$old_library"
+ fi
+ ;;
+ * )
+ # Prefer using a static library (so that no silly _DYNAMIC symbols
+ # are required to link).
+ if test -n "$old_library"; then
+ func_append newdlprefiles " $dir/$old_library"
+ # Keep a list of preopened convenience libraries to check
+ # that they are being used correctly in the link pass.
+ test -z "$libdir" && \
+ func_append dlpreconveniencelibs " $dir/$old_library"
+ # Otherwise, use the dlname, so that lt_dlopen finds it.
+ elif test -n "$dlname"; then
+ func_append newdlprefiles " $dir/$dlname"
+ else
+ func_append newdlprefiles " $dir/$linklib"
+ fi
+ ;;
+ esac
fi # $pass = dlpreopen
if test -z "$libdir"; then
@@ -5471,7 +6589,7 @@ func_mode_link ()
if test "$linkmode" = prog && test "$pass" != link; then
- newlib_search_path="$newlib_search_path $ladir"
+ func_append newlib_search_path " $ladir"
deplibs="$lib $deplibs"
linkalldeplibs=no
@@ -5484,7 +6602,8 @@ func_mode_link ()
for deplib in $dependency_libs; do
case $deplib in
-L*) func_stripname '-L' '' "$deplib"
- newlib_search_path="$newlib_search_path $func_stripname_result"
+ func_resolve_sysroot "$func_stripname_result"
+ func_append newlib_search_path " $func_resolve_sysroot_result"
;;
esac
# Need to link against all dependency_libs?
@@ -5495,12 +6614,12 @@ func_mode_link ()
# or/and link against static libraries
newdependency_libs="$deplib $newdependency_libs"
fi
- if $opt_duplicate_deps ; then
+ if $opt_preserve_dup_deps ; then
case "$tmp_libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
fi
- tmp_libs="$tmp_libs $deplib"
+ func_append tmp_libs " $deplib"
done # for deplib
continue
fi # $linkmode = prog...
@@ -5515,7 +6634,7 @@ func_mode_link ()
# Make sure the rpath contains only unique directories.
case "$temp_rpath:" in
*"$absdir:"*) ;;
- *) temp_rpath="$temp_rpath$absdir:" ;;
+ *) func_append temp_rpath "$absdir:" ;;
esac
fi
@@ -5527,7 +6646,7 @@ func_mode_link ()
*)
case "$compile_rpath " in
*" $absdir "*) ;;
- *) compile_rpath="$compile_rpath $absdir"
+ *) func_append compile_rpath " $absdir" ;;
esac
;;
esac
@@ -5536,7 +6655,7 @@ func_mode_link ()
*)
case "$finalize_rpath " in
*" $libdir "*) ;;
- *) finalize_rpath="$finalize_rpath $libdir"
+ *) func_append finalize_rpath " $libdir" ;;
esac
;;
esac
@@ -5561,12 +6680,12 @@ func_mode_link ()
case $host in
*cygwin* | *mingw* | *cegcc*)
# No point in relinking DLLs because paths are not encoded
- notinst_deplibs="$notinst_deplibs $lib"
+ func_append notinst_deplibs " $lib"
need_relink=no
;;
*)
if test "$installed" = no; then
- notinst_deplibs="$notinst_deplibs $lib"
+ func_append notinst_deplibs " $lib"
need_relink=yes
fi
;;
@@ -5583,7 +6702,7 @@ func_mode_link ()
fi
done
if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
- $ECHO
+ echo
if test "$linkmode" = prog; then
$ECHO "*** Warning: Linking the executable $output against the loadable module"
else
@@ -5601,7 +6720,7 @@ func_mode_link ()
*)
case "$compile_rpath " in
*" $absdir "*) ;;
- *) compile_rpath="$compile_rpath $absdir"
+ *) func_append compile_rpath " $absdir" ;;
esac
;;
esac
@@ -5610,7 +6729,7 @@ func_mode_link ()
*)
case "$finalize_rpath " in
*" $libdir "*) ;;
- *) finalize_rpath="$finalize_rpath $libdir"
+ *) func_append finalize_rpath " $libdir" ;;
esac
;;
esac
@@ -5664,7 +6783,7 @@ func_mode_link ()
linklib=$newlib
fi # test -n "$old_archive_from_expsyms_cmds"
- if test "$linkmode" = prog || test "$mode" != relink; then
+ if test "$linkmode" = prog || test "$opt_mode" != relink; then
add_shlibpath=
add_dir=
add=
@@ -5686,9 +6805,9 @@ func_mode_link ()
if test "X$dlopenmodule" != "X$lib"; then
$ECHO "*** Warning: lib $linklib is a module, not a shared library"
if test -z "$old_library" ; then
- $ECHO
- $ECHO "*** And there doesn't seem to be a static archive available"
- $ECHO "*** The link will probably fail, sorry"
+ echo
+ echo "*** And there doesn't seem to be a static archive available"
+ echo "*** The link will probably fail, sorry"
else
add="$dir/$old_library"
fi
@@ -5720,7 +6839,7 @@ func_mode_link ()
if test -n "$inst_prefix_dir"; then
case $libdir in
[\\/]*)
- add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ func_append add_dir " -L$inst_prefix_dir$libdir"
;;
esac
fi
@@ -5742,7 +6861,7 @@ func_mode_link ()
if test -n "$add_shlibpath"; then
case :$compile_shlibpath: in
*":$add_shlibpath:"*) ;;
- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+ *) func_append compile_shlibpath "$add_shlibpath:" ;;
esac
fi
if test "$linkmode" = prog; then
@@ -5756,13 +6875,13 @@ func_mode_link ()
test "$hardcode_shlibpath_var" = yes; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+ *) func_append finalize_shlibpath "$libdir:" ;;
esac
fi
fi
fi
- if test "$linkmode" = prog || test "$mode" = relink; then
+ if test "$linkmode" = prog || test "$opt_mode" = relink; then
add_shlibpath=
add_dir=
add=
@@ -5776,7 +6895,7 @@ func_mode_link ()
elif test "$hardcode_shlibpath_var" = yes; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+ *) func_append finalize_shlibpath "$libdir:" ;;
esac
add="-l$name"
elif test "$hardcode_automatic" = yes; then
@@ -5793,7 +6912,7 @@ func_mode_link ()
if test -n "$inst_prefix_dir"; then
case $libdir in
[\\/]*)
- add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ func_append add_dir " -L$inst_prefix_dir$libdir"
;;
esac
fi
@@ -5828,21 +6947,21 @@ func_mode_link ()
# Just print a warning and add the library to dependency_libs so
# that the program can be linked against the static library.
- $ECHO
+ echo
$ECHO "*** Warning: This system can not link to static lib archive $lib."
- $ECHO "*** I have the capability to make that library automatically link in when"
- $ECHO "*** you link to this library. But I can only do this if you have a"
- $ECHO "*** shared version of the library, which you do not appear to have."
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have."
if test "$module" = yes; then
- $ECHO "*** But as you try to build a module library, libtool will still create "
- $ECHO "*** a static module, that should work as long as the dlopening application"
- $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
+ echo "*** But as you try to build a module library, libtool will still create "
+ echo "*** a static module, that should work as long as the dlopening application"
+ echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
if test -z "$global_symbol_pipe"; then
- $ECHO
- $ECHO "*** However, this would only work if libtool was able to extract symbol"
- $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
- $ECHO "*** not find such a program. So, this module is probably useless."
- $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
+ echo
+ echo "*** However, this would only work if libtool was able to extract symbol"
+ echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ echo "*** not find such a program. So, this module is probably useless."
+ echo "*** \`nm' from GNU binutils and a full rebuild may help."
fi
if test "$build_old_libs" = no; then
build_libtool_libs=module
@@ -5870,27 +6989,33 @@ func_mode_link ()
temp_xrpath=$func_stripname_result
case " $xrpath " in
*" $temp_xrpath "*) ;;
- *) xrpath="$xrpath $temp_xrpath";;
+ *) func_append xrpath " $temp_xrpath";;
esac;;
- *) temp_deplibs="$temp_deplibs $libdir";;
+ *) func_append temp_deplibs " $libdir";;
esac
done
dependency_libs="$temp_deplibs"
fi
- newlib_search_path="$newlib_search_path $absdir"
+ func_append newlib_search_path " $absdir"
# Link against this library
test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
# ... and its dependency_libs
tmp_libs=
for deplib in $dependency_libs; do
newdependency_libs="$deplib $newdependency_libs"
- if $opt_duplicate_deps ; then
+ case $deplib in
+ -L*) func_stripname '-L' '' "$deplib"
+ func_resolve_sysroot "$func_stripname_result";;
+ *) func_resolve_sysroot "$deplib" ;;
+ esac
+ if $opt_preserve_dup_deps ; then
case "$tmp_libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ *" $func_resolve_sysroot_result "*)
+ func_append specialdeplibs " $func_resolve_sysroot_result" ;;
esac
fi
- tmp_libs="$tmp_libs $deplib"
+ func_append tmp_libs " $func_resolve_sysroot_result"
done
if test "$link_all_deplibs" != no; then
@@ -5900,8 +7025,10 @@ func_mode_link ()
case $deplib in
-L*) path="$deplib" ;;
*.la)
+ func_resolve_sysroot "$deplib"
+ deplib=$func_resolve_sysroot_result
func_dirname "$deplib" "" "."
- dir="$func_dirname_result"
+ dir=$func_dirname_result
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
@@ -5928,8 +7055,8 @@ func_mode_link ()
if test -z "$darwin_install_name"; then
darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
fi
- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
+ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
path=
fi
fi
@@ -5962,7 +7089,7 @@ func_mode_link ()
compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
else
- compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
fi
fi
dependency_libs="$newdependency_libs"
@@ -5979,7 +7106,7 @@ func_mode_link ()
for dir in $newlib_search_path; do
case "$lib_search_path " in
*" $dir "*) ;;
- *) lib_search_path="$lib_search_path $dir" ;;
+ *) func_append lib_search_path " $dir" ;;
esac
done
newlib_search_path=
@@ -6037,10 +7164,10 @@ func_mode_link ()
-L*)
case " $tmp_libs " in
*" $deplib "*) ;;
- *) tmp_libs="$tmp_libs $deplib" ;;
+ *) func_append tmp_libs " $deplib" ;;
esac
;;
- *) tmp_libs="$tmp_libs $deplib" ;;
+ *) func_append tmp_libs " $deplib" ;;
esac
done
eval $var=\"$tmp_libs\"
@@ -6056,7 +7183,7 @@ func_mode_link ()
;;
esac
if test -n "$i" ; then
- tmp_libs="$tmp_libs $i"
+ func_append tmp_libs " $i"
fi
done
dependency_libs=$tmp_libs
@@ -6097,7 +7224,7 @@ func_mode_link ()
# Now set the variables for building old libraries.
build_libtool_libs=no
oldlibs="$output"
- objs="$objs$old_deplibs"
+ func_append objs "$old_deplibs"
;;
lib)
@@ -6130,10 +7257,10 @@ func_mode_link ()
if test "$deplibs_check_method" != pass_all; then
func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
else
- $ECHO
+ echo
$ECHO "*** Warning: Linking the shared library $output against the non-libtool"
$ECHO "*** objects $objs is not portable!"
- libobjs="$libobjs $objs"
+ func_append libobjs " $objs"
fi
fi
@@ -6198,7 +7325,7 @@ func_mode_link ()
age="$number_minor"
revision="$number_revision"
;;
- freebsd-aout|freebsd-elf|sunos)
+ freebsd-aout|freebsd-elf|qnx|sunos)
current="$number_major"
revision="$number_minor"
age="0"
@@ -6334,7 +7461,7 @@ func_mode_link ()
done
# Make executables depend on our current version.
- verstring="$verstring:${current}.0"
+ func_append verstring ":${current}.0"
;;
qnx)
@@ -6402,10 +7529,10 @@ func_mode_link ()
fi
func_generate_dlsyms "$libname" "$libname" "yes"
- libobjs="$libobjs $symfileobj"
+ func_append libobjs " $symfileobj"
test "X$libobjs" = "X " && libobjs=
- if test "$mode" != relink; then
+ if test "$opt_mode" != relink; then
# Remove our outputs, but don't remove object files since they
# may have been created when compiling PIC objects.
removelist=
@@ -6421,7 +7548,7 @@ func_mode_link ()
continue
fi
fi
- removelist="$removelist $p"
+ func_append removelist " $p"
;;
*) ;;
esac
@@ -6432,27 +7559,28 @@ func_mode_link ()
# Now set the variables for building old libraries.
if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
- oldlibs="$oldlibs $output_objdir/$libname.$libext"
+ func_append oldlibs " $output_objdir/$libname.$libext"
# Transform .lo files to .o files.
- oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+ oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
fi
# Eliminate all temporary directories.
#for path in $notinst_path; do
- # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
- # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
- # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
+ # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
+ # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
+ # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
#done
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
temp_xrpath=
for libdir in $xrpath; do
- temp_xrpath="$temp_xrpath -R$libdir"
+ func_replace_sysroot "$libdir"
+ func_append temp_xrpath " -R$func_replace_sysroot_result"
case "$finalize_rpath " in
*" $libdir "*) ;;
- *) finalize_rpath="$finalize_rpath $libdir" ;;
+ *) func_append finalize_rpath " $libdir" ;;
esac
done
if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
@@ -6466,7 +7594,7 @@ func_mode_link ()
for lib in $old_dlfiles; do
case " $dlprefiles $dlfiles " in
*" $lib "*) ;;
- *) dlfiles="$dlfiles $lib" ;;
+ *) func_append dlfiles " $lib" ;;
esac
done
@@ -6476,19 +7604,19 @@ func_mode_link ()
for lib in $old_dlprefiles; do
case "$dlprefiles " in
*" $lib "*) ;;
- *) dlprefiles="$dlprefiles $lib" ;;
+ *) func_append dlprefiles " $lib" ;;
esac
done
if test "$build_libtool_libs" = yes; then
if test -n "$rpath"; then
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
# these systems don't actually have a c library (as such)!
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C library is in the System framework
- deplibs="$deplibs System.ltframework"
+ func_append deplibs " System.ltframework"
;;
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
@@ -6505,7 +7633,7 @@ func_mode_link ()
*)
# Add libc to deplibs on all other systems if necessary.
if test "$build_libtool_need_lc" = "yes"; then
- deplibs="$deplibs -lc"
+ func_append deplibs " -lc"
fi
;;
esac
@@ -6554,7 +7682,7 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
- newdeplibs="$newdeplibs $i"
+ func_append newdeplibs " $i"
i=""
;;
esac
@@ -6565,21 +7693,21 @@ EOF
set dummy $deplib_matches; shift
deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
- newdeplibs="$newdeplibs $i"
+ func_append newdeplibs " $i"
else
droppeddeps=yes
- $ECHO
+ echo
$ECHO "*** Warning: dynamic linker does not accept needed library $i."
- $ECHO "*** I have the capability to make that library automatically link in when"
- $ECHO "*** you link to this library. But I can only do this if you have a"
- $ECHO "*** shared version of the library, which I believe you do not have"
- $ECHO "*** because a test_compile did reveal that the linker did not use it for"
- $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which I believe you do not have"
+ echo "*** because a test_compile did reveal that the linker did not use it for"
+ echo "*** its dynamic dependency list that programs get resolved with at runtime."
fi
fi
;;
*)
- newdeplibs="$newdeplibs $i"
+ func_append newdeplibs " $i"
;;
esac
done
@@ -6597,7 +7725,7 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
- newdeplibs="$newdeplibs $i"
+ func_append newdeplibs " $i"
i=""
;;
esac
@@ -6608,29 +7736,29 @@ EOF
set dummy $deplib_matches; shift
deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
- newdeplibs="$newdeplibs $i"
+ func_append newdeplibs " $i"
else
droppeddeps=yes
- $ECHO
+ echo
$ECHO "*** Warning: dynamic linker does not accept needed library $i."
- $ECHO "*** I have the capability to make that library automatically link in when"
- $ECHO "*** you link to this library. But I can only do this if you have a"
- $ECHO "*** shared version of the library, which you do not appear to have"
- $ECHO "*** because a test_compile did reveal that the linker did not use this one"
- $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have"
+ echo "*** because a test_compile did reveal that the linker did not use this one"
+ echo "*** as a dynamic dependency that programs can get resolved with at runtime."
fi
fi
else
droppeddeps=yes
- $ECHO
+ echo
$ECHO "*** Warning! Library $i is needed by this library but I was not able to"
- $ECHO "*** make it link in! You will probably need to install it or some"
- $ECHO "*** library that it depends on before this library will be fully"
- $ECHO "*** functional. Installing it before continuing would be even better."
+ echo "*** make it link in! You will probably need to install it or some"
+ echo "*** library that it depends on before this library will be fully"
+ echo "*** functional. Installing it before continuing would be even better."
fi
;;
*)
- newdeplibs="$newdeplibs $i"
+ func_append newdeplibs " $i"
;;
esac
done
@@ -6647,15 +7775,27 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $a_deplib "*)
- newdeplibs="$newdeplibs $a_deplib"
+ func_append newdeplibs " $a_deplib"
a_deplib=""
;;
esac
fi
if test -n "$a_deplib" ; then
libname=`eval "\\$ECHO \"$libname_spec\""`
+ if test -n "$file_magic_glob"; then
+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
+ else
+ libnameglob=$libname
+ fi
+ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
- potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+ if test "$want_nocaseglob" = yes; then
+ shopt -s nocaseglob
+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+ $nocaseglob
+ else
+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+ fi
for potent_lib in $potential_libs; do
# Follow soft links.
if ls -lLd "$potent_lib" 2>/dev/null |
@@ -6672,13 +7812,13 @@ EOF
potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
case $potliblink in
[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
- *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+ *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
esac
done
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
$SED -e 10q |
$EGREP "$file_magic_regex" > /dev/null; then
- newdeplibs="$newdeplibs $a_deplib"
+ func_append newdeplibs " $a_deplib"
a_deplib=""
break 2
fi
@@ -6687,12 +7827,12 @@ EOF
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
- $ECHO
+ echo
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
- $ECHO "*** I have the capability to make that library automatically link in when"
- $ECHO "*** you link to this library. But I can only do this if you have a"
- $ECHO "*** shared version of the library, which you do not appear to have"
- $ECHO "*** because I did check the linker path looking for a file starting"
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have"
+ echo "*** because I did check the linker path looking for a file starting"
if test -z "$potlib" ; then
$ECHO "*** with $libname but no candidates were found. (...for file magic test)"
else
@@ -6703,7 +7843,7 @@ EOF
;;
*)
# Add a -L argument.
- newdeplibs="$newdeplibs $a_deplib"
+ func_append newdeplibs " $a_deplib"
;;
esac
done # Gone through all deplibs.
@@ -6719,7 +7859,7 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $a_deplib "*)
- newdeplibs="$newdeplibs $a_deplib"
+ func_append newdeplibs " $a_deplib"
a_deplib=""
;;
esac
@@ -6730,9 +7870,9 @@ EOF
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
for potent_lib in $potential_libs; do
potlib="$potent_lib" # see symlink-check above in file_magic test
- if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
+ if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
$EGREP "$match_pattern_regex" > /dev/null; then
- newdeplibs="$newdeplibs $a_deplib"
+ func_append newdeplibs " $a_deplib"
a_deplib=""
break 2
fi
@@ -6741,12 +7881,12 @@ EOF
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
- $ECHO
+ echo
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
- $ECHO "*** I have the capability to make that library automatically link in when"
- $ECHO "*** you link to this library. But I can only do this if you have a"
- $ECHO "*** shared version of the library, which you do not appear to have"
- $ECHO "*** because I did check the linker path looking for a file starting"
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have"
+ echo "*** because I did check the linker path looking for a file starting"
if test -z "$potlib" ; then
$ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
else
@@ -6757,32 +7897,32 @@ EOF
;;
*)
# Add a -L argument.
- newdeplibs="$newdeplibs $a_deplib"
+ func_append newdeplibs " $a_deplib"
;;
esac
done # Gone through all deplibs.
;;
none | unknown | *)
newdeplibs=""
- tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
- -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
+ tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
for i in $predeps $postdeps ; do
# can't use Xsed below, because $i might contain '/'
- tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
+ tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
done
fi
- if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' |
- $GREP . >/dev/null; then
- $ECHO
+ case $tmp_deplibs in
+ *[!\ \ ]*)
+ echo
if test "X$deplibs_check_method" = "Xnone"; then
- $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
+ echo "*** Warning: inter-library dependencies are not supported in this platform."
else
- $ECHO "*** Warning: inter-library dependencies are not known to be supported."
+ echo "*** Warning: inter-library dependencies are not known to be supported."
fi
- $ECHO "*** All declared inter-library dependencies are being dropped."
+ echo "*** All declared inter-library dependencies are being dropped."
droppeddeps=yes
- fi
+ ;;
+ esac
;;
esac
versuffix=$versuffix_save
@@ -6794,23 +7934,23 @@ EOF
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library with the System framework
- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+ newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
;;
esac
if test "$droppeddeps" = yes; then
if test "$module" = yes; then
- $ECHO
- $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
+ echo
+ echo "*** Warning: libtool could not satisfy all declared inter-library"
$ECHO "*** dependencies of module $libname. Therefore, libtool will create"
- $ECHO "*** a static module, that should work as long as the dlopening"
- $ECHO "*** application is linked with the -dlopen flag."
+ echo "*** a static module, that should work as long as the dlopening"
+ echo "*** application is linked with the -dlopen flag."
if test -z "$global_symbol_pipe"; then
- $ECHO
- $ECHO "*** However, this would only work if libtool was able to extract symbol"
- $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
- $ECHO "*** not find such a program. So, this module is probably useless."
- $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
+ echo
+ echo "*** However, this would only work if libtool was able to extract symbol"
+ echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ echo "*** not find such a program. So, this module is probably useless."
+ echo "*** \`nm' from GNU binutils and a full rebuild may help."
fi
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
@@ -6820,16 +7960,16 @@ EOF
build_libtool_libs=no
fi
else
- $ECHO "*** The inter-library dependencies that have been dropped here will be"
- $ECHO "*** automatically added whenever a program is linked with this library"
- $ECHO "*** or is declared to -dlopen it."
+ echo "*** The inter-library dependencies that have been dropped here will be"
+ echo "*** automatically added whenever a program is linked with this library"
+ echo "*** or is declared to -dlopen it."
if test "$allow_undefined" = no; then
- $ECHO
- $ECHO "*** Since this library must not contain undefined symbols,"
- $ECHO "*** because either the platform does not support them or"
- $ECHO "*** it was explicitly requested with -no-undefined,"
- $ECHO "*** libtool will only create a static version of it."
+ echo
+ echo "*** Since this library must not contain undefined symbols,"
+ echo "*** because either the platform does not support them or"
+ echo "*** it was explicitly requested with -no-undefined,"
+ echo "*** libtool will only create a static version of it."
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
build_libtool_libs=module
@@ -6846,9 +7986,9 @@ EOF
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
case $host in
*-*-darwin*)
- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
- new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
- deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
;;
esac
@@ -6861,7 +8001,7 @@ EOF
*)
case " $deplibs " in
*" -L$path/$objdir "*)
- new_libs="$new_libs -L$path/$objdir" ;;
+ func_append new_libs " -L$path/$objdir" ;;
esac
;;
esac
@@ -6871,10 +8011,10 @@ EOF
-L*)
case " $new_libs " in
*" $deplib "*) ;;
- *) new_libs="$new_libs $deplib" ;;
+ *) func_append new_libs " $deplib" ;;
esac
;;
- *) new_libs="$new_libs $deplib" ;;
+ *) func_append new_libs " $deplib" ;;
esac
done
deplibs="$new_libs"
@@ -6891,10 +8031,12 @@ EOF
hardcode_libdirs=
dep_rpath=
rpath="$finalize_rpath"
- test "$mode" != relink && rpath="$compile_rpath$rpath"
+ test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
for libdir in $rpath; do
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
+ func_replace_sysroot "$libdir"
+ libdir=$func_replace_sysroot_result
if test -z "$hardcode_libdirs"; then
hardcode_libdirs="$libdir"
else
@@ -6903,18 +8045,18 @@ EOF
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
;;
esac
fi
else
eval flag=\"$hardcode_libdir_flag_spec\"
- dep_rpath="$dep_rpath $flag"
+ func_append dep_rpath " $flag"
fi
elif test -n "$runpath_var"; then
case "$perm_rpath " in
*" $libdir "*) ;;
- *) perm_rpath="$perm_rpath $libdir" ;;
+ *) func_apped perm_rpath " $libdir" ;;
esac
fi
done
@@ -6932,7 +8074,7 @@ EOF
# We should set the runpath_var.
rpath=
for dir in $perm_rpath; do
- rpath="$rpath$dir:"
+ func_append rpath "$dir:"
done
eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
fi
@@ -6940,7 +8082,7 @@ EOF
fi
shlibpath="$finalize_shlibpath"
- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
if test -n "$shlibpath"; then
eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
fi
@@ -6966,18 +8108,18 @@ EOF
linknames=
for link
do
- linknames="$linknames $link"
+ func_append linknames " $link"
done
# Use standard objects if they are pic
- test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
test "X$libobjs" = "X " && libobjs=
delfiles=
if test -n "$export_symbols" && test -n "$include_expsyms"; then
$opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
export_symbols="$output_objdir/$libname.uexp"
- delfiles="$delfiles $export_symbols"
+ func_append delfiles " $export_symbols"
fi
orig_export_symbols=
@@ -7008,13 +8150,45 @@ EOF
$opt_dry_run || $RM $export_symbols
cmds=$export_symbols_cmds
save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
+ for cmd1 in $cmds; do
IFS="$save_ifs"
- eval cmd=\"$cmd\"
- func_len " $cmd"
- len=$func_len_result
- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ # Take the normal branch if the nm_file_list_spec branch
+ # doesn't work or if tool conversion is not needed.
+ case $nm_file_list_spec~$to_tool_file_cmd in
+ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
+ try_normal_branch=yes
+ eval cmd=\"$cmd1\"
+ func_len " $cmd"
+ len=$func_len_result
+ ;;
+ *)
+ try_normal_branch=no
+ ;;
+ esac
+ if test "$try_normal_branch" = yes \
+ && { test "$len" -lt "$max_cmd_len" \
+ || test "$max_cmd_len" -le -1; }
+ then
+ func_show_eval "$cmd" 'exit $?'
+ skipped_export=false
+ elif test -n "$nm_file_list_spec"; then
+ func_basename "$output"
+ output_la=$func_basename_result
+ save_libobjs=$libobjs
+ save_output=$output
+ output=${output_objdir}/${output_la}.nm
+ func_to_tool_file "$output"
+ libobjs=$nm_file_list_spec$func_to_tool_file_result
+ func_append delfiles " $output"
+ func_verbose "creating $NM input file list: $output"
+ for obj in $save_libobjs; do
+ func_to_tool_file "$obj"
+ $ECHO "$func_to_tool_file_result"
+ done > "$output"
+ eval cmd=\"$cmd1\"
func_show_eval "$cmd" 'exit $?'
+ output=$save_output
+ libobjs=$save_libobjs
skipped_export=false
else
# The command line is too long to execute in one step.
@@ -7036,7 +8210,7 @@ EOF
if test -n "$export_symbols" && test -n "$include_expsyms"; then
tmp_export_symbols="$export_symbols"
test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
fi
if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
@@ -7048,7 +8222,7 @@ EOF
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
$opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
@@ -7058,7 +8232,7 @@ EOF
case " $convenience " in
*" $test_deplib "*) ;;
*)
- tmp_deplibs="$tmp_deplibs $test_deplib"
+ func_append tmp_deplibs " $test_deplib"
;;
esac
done
@@ -7078,21 +8252,21 @@ EOF
test "X$libobjs" = "X " && libobjs=
else
gentop="$output_objdir/${outputname}x"
- generated="$generated $gentop"
+ func_append generated " $gentop"
func_extract_archives $gentop $convenience
- libobjs="$libobjs $func_extract_archives_result"
+ func_append libobjs " $func_extract_archives_result"
test "X$libobjs" = "X " && libobjs=
fi
fi
if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
eval flag=\"$thread_safe_flag_spec\"
- linker_flags="$linker_flags $flag"
+ func_append linker_flags " $flag"
fi
# Make a backup of the uninstalled library when relinking
- if test "$mode" = relink; then
+ if test "$opt_mode" = relink; then
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
fi
@@ -7137,7 +8311,8 @@ EOF
save_libobjs=$libobjs
fi
save_output=$output
- output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
+ func_basename "$output"
+ output_la=$func_basename_result
# Clear the reloadable object creation command queue and
# initialize k to one.
@@ -7150,13 +8325,16 @@ EOF
if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
output=${output_objdir}/${output_la}.lnkscript
func_verbose "creating GNU ld script: $output"
- $ECHO 'INPUT (' > $output
+ echo 'INPUT (' > $output
for obj in $save_libobjs
do
- $ECHO "$obj" >> $output
+ func_to_tool_file "$obj"
+ $ECHO "$func_to_tool_file_result" >> $output
done
- $ECHO ')' >> $output
- delfiles="$delfiles $output"
+ echo ')' >> $output
+ func_append delfiles " $output"
+ func_to_tool_file "$output"
+ output=$func_to_tool_file_result
elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
output=${output_objdir}/${output_la}.lnk
func_verbose "creating linker input file list: $output"
@@ -7170,10 +8348,12 @@ EOF
fi
for obj
do
- $ECHO "$obj" >> $output
+ func_to_tool_file "$obj"
+ $ECHO "$func_to_tool_file_result" >> $output
done
- delfiles="$delfiles $output"
- output=$firstobj\"$file_list_spec$output\"
+ func_append delfiles " $output"
+ func_to_tool_file "$output"
+ output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
else
if test -n "$save_libobjs"; then
func_verbose "creating reloadable object files..."
@@ -7197,17 +8377,19 @@ EOF
# command to the queue.
if test "$k" -eq 1 ; then
# The first file doesn't have a previous command to add.
- eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+ reload_objs=$objlist
+ eval concat_cmds=\"$reload_cmds\"
else
# All subsequent reloadable object files will link in
# the last one created.
- eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
+ reload_objs="$objlist $last_robj"
+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
fi
last_robj=$output_objdir/$output_la-${k}.$objext
func_arith $k + 1
k=$func_arith_result
output=$output_objdir/$output_la-${k}.$objext
- objlist=$obj
+ objlist=" $obj"
func_len " $last_robj"
func_arith $len0 + $func_len_result
len=$func_arith_result
@@ -7217,11 +8399,12 @@ EOF
# reloadable object file. All subsequent reloadable object
# files will link in the last one created.
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+ reload_objs="$objlist $last_robj"
+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
if test -n "$last_robj"; then
eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
fi
- delfiles="$delfiles $output"
+ func_append delfiles " $output"
else
output=
@@ -7255,7 +8438,7 @@ EOF
lt_exit=$?
# Restore the uninstalled library and exit
- if test "$mode" = relink; then
+ if test "$opt_mode" = relink; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
@@ -7276,7 +8459,7 @@ EOF
if test -n "$export_symbols" && test -n "$include_expsyms"; then
tmp_export_symbols="$export_symbols"
test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
fi
if test -n "$orig_export_symbols"; then
@@ -7288,7 +8471,7 @@ EOF
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
$opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
@@ -7329,10 +8512,10 @@ EOF
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
gentop="$output_objdir/${outputname}x"
- generated="$generated $gentop"
+ func_append generated " $gentop"
func_extract_archives $gentop $dlprefiles
- libobjs="$libobjs $func_extract_archives_result"
+ func_append libobjs " $func_extract_archives_result"
test "X$libobjs" = "X " && libobjs=
fi
@@ -7348,7 +8531,7 @@ EOF
lt_exit=$?
# Restore the uninstalled library and exit
- if test "$mode" = relink; then
+ if test "$opt_mode" = relink; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
@@ -7360,7 +8543,7 @@ EOF
IFS="$save_ifs"
# Restore the uninstalled library and exit
- if test "$mode" = relink; then
+ if test "$opt_mode" = relink; then
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
if test -n "$convenience"; then
@@ -7441,18 +8624,21 @@ EOF
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
- reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+ reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
- generated="$generated $gentop"
+ func_append generated " $gentop"
func_extract_archives $gentop $convenience
reload_conv_objs="$reload_objs $func_extract_archives_result"
fi
fi
+ # If we're not building shared, we need to use non_pic_objs
+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+
# Create the old-style object.
- reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+ reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
output="$obj"
func_execute_cmds "$reload_cmds" 'exit $?'
@@ -7512,8 +8698,8 @@ EOF
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+ compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
+ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
;;
esac
@@ -7524,14 +8710,14 @@ EOF
if test "$tagname" = CXX ; then
case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
10.[0123])
- compile_command="$compile_command ${wl}-bind_at_load"
- finalize_command="$finalize_command ${wl}-bind_at_load"
+ func_append compile_command " ${wl}-bind_at_load"
+ func_append finalize_command " ${wl}-bind_at_load"
;;
esac
fi
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
;;
esac
@@ -7545,7 +8731,7 @@ EOF
*)
case " $compile_deplibs " in
*" -L$path/$objdir "*)
- new_libs="$new_libs -L$path/$objdir" ;;
+ func_append new_libs " -L$path/$objdir" ;;
esac
;;
esac
@@ -7555,17 +8741,17 @@ EOF
-L*)
case " $new_libs " in
*" $deplib "*) ;;
- *) new_libs="$new_libs $deplib" ;;
+ *) func_append new_libs " $deplib" ;;
esac
;;
- *) new_libs="$new_libs $deplib" ;;
+ *) func_append new_libs " $deplib" ;;
esac
done
compile_deplibs="$new_libs"
- compile_command="$compile_command $compile_deplibs"
- finalize_command="$finalize_command $finalize_deplibs"
+ func_append compile_command " $compile_deplibs"
+ func_append finalize_command " $finalize_deplibs"
if test -n "$rpath$xrpath"; then
# If the user specified any rpath flags, then add them.
@@ -7573,7 +8759,7 @@ EOF
# This is the magic to use -rpath.
case "$finalize_rpath " in
*" $libdir "*) ;;
- *) finalize_rpath="$finalize_rpath $libdir" ;;
+ *) func_append finalize_rpath " $libdir" ;;
esac
done
fi
@@ -7592,18 +8778,18 @@ EOF
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
;;
esac
fi
else
eval flag=\"$hardcode_libdir_flag_spec\"
- rpath="$rpath $flag"
+ func_append rpath " $flag"
fi
elif test -n "$runpath_var"; then
case "$perm_rpath " in
*" $libdir "*) ;;
- *) perm_rpath="$perm_rpath $libdir" ;;
+ *) func_append perm_rpath " $libdir" ;;
esac
fi
case $host in
@@ -7612,12 +8798,12 @@ EOF
case :$dllsearchpath: in
*":$libdir:"*) ;;
::) dllsearchpath=$libdir;;
- *) dllsearchpath="$dllsearchpath:$libdir";;
+ *) func_append dllsearchpath ":$libdir";;
esac
case :$dllsearchpath: in
*":$testbindir:"*) ;;
::) dllsearchpath=$testbindir;;
- *) dllsearchpath="$dllsearchpath:$testbindir";;
+ *) func_append dllsearchpath ":$testbindir";;
esac
;;
esac
@@ -7643,18 +8829,18 @@ EOF
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
;;
esac
fi
else
eval flag=\"$hardcode_libdir_flag_spec\"
- rpath="$rpath $flag"
+ func_append rpath " $flag"
fi
elif test -n "$runpath_var"; then
case "$finalize_perm_rpath " in
*" $libdir "*) ;;
- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+ *) func_append finalize_perm_rpath " $libdir" ;;
esac
fi
done
@@ -7668,8 +8854,8 @@ EOF
if test -n "$libobjs" && test "$build_old_libs" = yes; then
# Transform all the library objects into standard objects.
- compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
- finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+ finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
fi
func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
@@ -7681,15 +8867,15 @@ EOF
wrappers_required=yes
case $host in
+ *cegcc* | *mingw32ce*)
+ # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
+ wrappers_required=no
+ ;;
*cygwin* | *mingw* )
if test "$build_libtool_libs" != yes; then
wrappers_required=no
fi
;;
- *cegcc)
- # Disable wrappers for cegcc, we are cross compiling anyway.
- wrappers_required=no
- ;;
*)
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
wrappers_required=no
@@ -7698,13 +8884,19 @@ EOF
esac
if test "$wrappers_required" = no; then
# Replace the output file specification.
- compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
exit_status=0
func_show_eval "$link_command" 'exit_status=$?'
+ if test -n "$postlink_cmds"; then
+ func_to_tool_file "$output"
+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+ func_execute_cmds "$postlink_cmds" 'exit $?'
+ fi
+
# Delete the generated files.
if test -f "$output_objdir/${outputname}S.${objext}"; then
func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
@@ -7727,7 +8919,7 @@ EOF
# We should set the runpath_var.
rpath=
for dir in $perm_rpath; do
- rpath="$rpath$dir:"
+ func_append rpath "$dir:"
done
compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
fi
@@ -7735,7 +8927,7 @@ EOF
# We should set the runpath_var.
rpath=
for dir in $finalize_perm_rpath; do
- rpath="$rpath$dir:"
+ func_append rpath "$dir:"
done
finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
fi
@@ -7745,11 +8937,18 @@ EOF
# We don't need to create a wrapper script.
link_command="$compile_var$compile_command$compile_rpath"
# Replace the output file specification.
- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
# Delete the old output file.
$opt_dry_run || $RM $output
# Link the executable and exit
func_show_eval "$link_command" 'exit $?'
+
+ if test -n "$postlink_cmds"; then
+ func_to_tool_file "$output"
+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+ func_execute_cmds "$postlink_cmds" 'exit $?'
+ fi
+
exit $EXIT_SUCCESS
fi
@@ -7764,7 +8963,7 @@ EOF
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
- relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+ relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
else
# fast_install is set to needless
relink_command=
@@ -7776,13 +8975,19 @@ EOF
fi
# Replace the output file specification.
- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
# Delete the old output files.
$opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
func_show_eval "$link_command" 'exit $?'
+ if test -n "$postlink_cmds"; then
+ func_to_tool_file "$output_objdir/$outputname"
+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+ func_execute_cmds "$postlink_cmds" 'exit $?'
+ fi
+
# Now create the wrapper script.
func_verbose "creating $output"
@@ -7800,18 +9005,7 @@ EOF
fi
done
relink_command="(cd `pwd`; $relink_command)"
- relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
- fi
-
- # Quote $ECHO for shipping.
- if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
- case $progpath in
- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
- *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
- esac
- qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
- else
- qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
fi
# Only actually do things if not in dry run mode.
@@ -7891,7 +9085,7 @@ EOF
else
oldobjs="$old_deplibs $non_pic_objects"
if test "$preload" = yes && test -f "$symfileobj"; then
- oldobjs="$oldobjs $symfileobj"
+ func_append oldobjs " $symfileobj"
fi
fi
addlibs="$old_convenience"
@@ -7899,10 +9093,10 @@ EOF
if test -n "$addlibs"; then
gentop="$output_objdir/${outputname}x"
- generated="$generated $gentop"
+ func_append generated " $gentop"
func_extract_archives $gentop $addlibs
- oldobjs="$oldobjs $func_extract_archives_result"
+ func_append oldobjs " $func_extract_archives_result"
fi
# Do each command in the archive commands.
@@ -7913,10 +9107,10 @@ EOF
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
gentop="$output_objdir/${outputname}x"
- generated="$generated $gentop"
+ func_append generated " $gentop"
func_extract_archives $gentop $dlprefiles
- oldobjs="$oldobjs $func_extract_archives_result"
+ func_append oldobjs " $func_extract_archives_result"
fi
# POSIX demands no paths to be encoded in archives. We have
@@ -7932,9 +9126,9 @@ EOF
done | sort | sort -uc >/dev/null 2>&1); then
:
else
- $ECHO "copying selected object files to avoid basename conflicts..."
+ echo "copying selected object files to avoid basename conflicts..."
gentop="$output_objdir/${outputname}x"
- generated="$generated $gentop"
+ func_append generated " $gentop"
func_mkdir_p "$gentop"
save_oldobjs=$oldobjs
oldobjs=
@@ -7958,9 +9152,9 @@ EOF
esac
done
func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
- oldobjs="$oldobjs $gentop/$newobj"
+ func_append oldobjs " $gentop/$newobj"
;;
- *) oldobjs="$oldobjs $obj" ;;
+ *) func_append oldobjs " $obj" ;;
esac
done
fi
@@ -7970,6 +9164,16 @@ EOF
len=$func_len_result
if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
cmds=$old_archive_cmds
+ elif test -n "$archiver_list_spec"; then
+ func_verbose "using command file archive linking..."
+ for obj in $oldobjs
+ do
+ func_to_tool_file "$obj"
+ $ECHO "$func_to_tool_file_result"
+ done > $output_objdir/$libname.libcmd
+ func_to_tool_file "$output_objdir/$libname.libcmd"
+ oldobjs=" $archiver_list_spec$func_to_tool_file_result"
+ cmds=$old_archive_cmds
else
# the command line is too long to link in one step, link in parts
func_verbose "using piecewise archive linking..."
@@ -8043,7 +9247,7 @@ EOF
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
- relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
@@ -8066,9 +9270,19 @@ EOF
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
test -z "$libdir" && \
func_fatal_error "\`$deplib' is not a valid libtool archive"
- newdependency_libs="$newdependency_libs $libdir/$name"
+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
+ ;;
+ -L*)
+ func_stripname -L '' "$deplib"
+ func_replace_sysroot "$func_stripname_result"
+ func_append newdependency_libs " -L$func_replace_sysroot_result"
;;
- *) newdependency_libs="$newdependency_libs $deplib" ;;
+ -R*)
+ func_stripname -R '' "$deplib"
+ func_replace_sysroot "$func_stripname_result"
+ func_append newdependency_libs " -R$func_replace_sysroot_result"
+ ;;
+ *) func_append newdependency_libs " $deplib" ;;
esac
done
dependency_libs="$newdependency_libs"
@@ -8082,9 +9296,9 @@ EOF
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
func_fatal_error "\`$lib' is not a valid libtool archive"
- newdlfiles="$newdlfiles $libdir/$name"
+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
;;
- *) newdlfiles="$newdlfiles $lib" ;;
+ *) func_append newdlfiles " $lib" ;;
esac
done
dlfiles="$newdlfiles"
@@ -8101,7 +9315,7 @@ EOF
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
func_fatal_error "\`$lib' is not a valid libtool archive"
- newdlprefiles="$newdlprefiles $libdir/$name"
+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
;;
esac
done
@@ -8113,7 +9327,7 @@ EOF
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
*) abs=`pwd`"/$lib" ;;
esac
- newdlfiles="$newdlfiles $abs"
+ func_append newdlfiles " $abs"
done
dlfiles="$newdlfiles"
newdlprefiles=
@@ -8122,15 +9336,33 @@ EOF
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
*) abs=`pwd`"/$lib" ;;
esac
- newdlprefiles="$newdlprefiles $abs"
+ func_append newdlprefiles " $abs"
done
dlprefiles="$newdlprefiles"
fi
$RM $output
# place dlname in correct position for cygwin
+ # In fact, it would be nice if we could use this code for all target
+ # systems that can't hard-code library paths into their executables
+ # and that have no shared library path variable independent of PATH,
+ # but it turns out we can't easily determine that from inspecting
+ # libtool variables, so we have to hard-code the OSs to which it
+ # applies here; at the moment, that means platforms that use the PE
+ # object format with DLL files. See the long comment at the top of
+ # tests/bindir.at for full details.
tdlname=$dlname
case $host,$output,$installed,$module,$dlname in
- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+ # If a -bindir argument was supplied, place the dll there.
+ if test "x$bindir" != x ;
+ then
+ func_relative_path "$install_libdir" "$bindir"
+ tdlname=$func_relative_path_result$dlname
+ else
+ # Otherwise fall back on heuristic.
+ tdlname=../bin/$dlname
+ fi
+ ;;
esac
$ECHO > $output "\
# $outputname - a libtool library file
@@ -8189,7 +9421,7 @@ relink_command=\"$relink_command\""
exit $EXIT_SUCCESS
}
-{ test "$mode" = link || test "$mode" = relink; } &&
+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
func_mode_link ${1+"$@"}
@@ -8209,9 +9441,9 @@ func_mode_uninstall ()
for arg
do
case $arg in
- -f) RM="$RM $arg"; rmforce=yes ;;
- -*) RM="$RM $arg" ;;
- *) files="$files $arg" ;;
+ -f) func_append RM " $arg"; rmforce=yes ;;
+ -*) func_append RM " $arg" ;;
+ *) func_append files " $arg" ;;
esac
done
@@ -8220,24 +9452,23 @@ func_mode_uninstall ()
rmdirs=
- origobjdir="$objdir"
for file in $files; do
func_dirname "$file" "" "."
dir="$func_dirname_result"
if test "X$dir" = X.; then
- objdir="$origobjdir"
+ odir="$objdir"
else
- objdir="$dir/$origobjdir"
+ odir="$dir/$objdir"
fi
func_basename "$file"
name="$func_basename_result"
- test "$mode" = uninstall && objdir="$dir"
+ test "$opt_mode" = uninstall && odir="$dir"
- # Remember objdir for removal later, being careful to avoid duplicates
- if test "$mode" = clean; then
+ # Remember odir for removal later, being careful to avoid duplicates
+ if test "$opt_mode" = clean; then
case " $rmdirs " in
- *" $objdir "*) ;;
- *) rmdirs="$rmdirs $objdir" ;;
+ *" $odir "*) ;;
+ *) func_append rmdirs " $odir" ;;
esac
fi
@@ -8263,18 +9494,17 @@ func_mode_uninstall ()
# Delete the libtool libraries and symlinks.
for n in $library_names; do
- rmfiles="$rmfiles $objdir/$n"
+ func_append rmfiles " $odir/$n"
done
- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+ test -n "$old_library" && func_append rmfiles " $odir/$old_library"
- case "$mode" in
+ case "$opt_mode" in
clean)
- case " $library_names " in
- # " " in the beginning catches empty $dlname
+ case " $library_names " in
*" $dlname "*) ;;
- *) rmfiles="$rmfiles $objdir/$dlname" ;;
+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
esac
- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
;;
uninstall)
if test -n "$library_names"; then
@@ -8302,19 +9532,19 @@ func_mode_uninstall ()
# Add PIC object to the list of files to remove.
if test -n "$pic_object" &&
test "$pic_object" != none; then
- rmfiles="$rmfiles $dir/$pic_object"
+ func_append rmfiles " $dir/$pic_object"
fi
# Add non-PIC object to the list of files to remove.
if test -n "$non_pic_object" &&
test "$non_pic_object" != none; then
- rmfiles="$rmfiles $dir/$non_pic_object"
+ func_append rmfiles " $dir/$non_pic_object"
fi
fi
;;
*)
- if test "$mode" = clean ; then
+ if test "$opt_mode" = clean ; then
noexename=$name
case $file in
*.exe)
@@ -8324,7 +9554,7 @@ func_mode_uninstall ()
noexename=$func_stripname_result
# $file with .exe has already been added to rmfiles,
# add $file without .exe
- rmfiles="$rmfiles $file"
+ func_append rmfiles " $file"
;;
esac
# Do a test to see if this is a libtool program.
@@ -8333,7 +9563,7 @@ func_mode_uninstall ()
func_ltwrapper_scriptname "$file"
relink_command=
func_source $func_ltwrapper_scriptname_result
- rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
+ func_append rmfiles " $func_ltwrapper_scriptname_result"
else
relink_command=
func_source $dir/$noexename
@@ -8341,12 +9571,12 @@ func_mode_uninstall ()
# note $name still contains .exe if it was in $file originally
# as does the version of $file that was added into $rmfiles
- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
if test "$fast_install" = yes && test -n "$relink_command"; then
- rmfiles="$rmfiles $objdir/lt-$name"
+ func_append rmfiles " $odir/lt-$name"
fi
if test "X$noexename" != "X$name" ; then
- rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+ func_append rmfiles " $odir/lt-${noexename}.c"
fi
fi
fi
@@ -8354,7 +9584,6 @@ func_mode_uninstall ()
esac
func_show_eval "$RM $rmfiles" 'exit_status=1'
done
- objdir="$origobjdir"
# Try to remove the ${objdir}s in the directories where we deleted files
for dir in $rmdirs; do
@@ -8366,16 +9595,16 @@ func_mode_uninstall ()
exit $exit_status
}
-{ test "$mode" = uninstall || test "$mode" = clean; } &&
+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
func_mode_uninstall ${1+"$@"}
-test -z "$mode" && {
+test -z "$opt_mode" && {
help="$generic_help"
func_fatal_help "you must specify a MODE"
}
test -z "$exec_cmd" && \
- func_fatal_help "invalid operation mode \`$mode'"
+ func_fatal_help "invalid operation mode \`$opt_mode'"
if test -n "$exec_cmd"; then
eval exec "$exec_cmd"
diff -pruN 3.0.0-2/m4/libtool.m4 3.0.1-0ubuntu1/m4/libtool.m4
--- 3.0.0-2/m4/libtool.m4 2011-04-04 08:31:24.000000000 +0000
+++ 3.0.1-0ubuntu1/m4/libtool.m4 2012-01-03 09:26:43.000000000 +0000
@@ -1,7 +1,8 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+# Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is free software; the Free Software Foundation gives
@@ -10,7 +11,8 @@
m4_define([_LT_COPYING], [dnl
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+# Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
])
-# serial 56 LT_INIT
+# serial 57 LT_INIT
# LT_PREREQ(VERSION)
@@ -66,6 +68,7 @@ esac
# ------------------
AC_DEFUN([LT_INIT],
[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
AC_BEFORE([$0], [LT_LANG])dnl
AC_BEFORE([$0], [LT_OUTPUT])dnl
AC_BEFORE([$0], [LTDL_INIT])dnl
@@ -82,6 +85,8 @@ AC_REQUIRE([LTVERSION_VERSION])dnl
AC_REQUIRE([LTOBSOLETE_VERSION])dnl
m4_require([_LT_PROG_LTMAIN])dnl
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
dnl Parse OPTIONS
_LT_SET_OPTIONS([$0], [$1])
@@ -118,7 +123,7 @@ m4_defun([_LT_CC_BASENAME],
*) break;;
esac
done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
])
@@ -138,6 +143,9 @@ m4_defun([_LT_FILEUTILS_DEFAULTS],
m4_defun([_LT_SETUP],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
_LT_DECL([], [host_alias], [0], [The host system])dnl
_LT_DECL([], [host], [0])dnl
_LT_DECL([], [host_os], [0])dnl
@@ -160,10 +168,13 @@ _LT_DECL([], [exeext], [0], [Executable
dnl
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
m4_require([_LT_CMD_RELOAD])dnl
m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
m4_require([_LT_CMD_OLD_ARCHIVE])dnl
m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
_LT_CONFIG_LIBTOOL_INIT([
# See if we are running on zsh, and set the options which allow our
@@ -179,7 +190,6 @@ fi
_LT_CHECK_OBJDIR
m4_require([_LT_TAG_COMPILER])dnl
-_LT_PROG_ECHO_BACKSLASH
case $host_os in
aix3*)
@@ -193,23 +203,6 @@ aix3*)
;;
esac
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
# Global variables:
ofile=libtool
can_build_shared=yes
@@ -250,6 +243,28 @@ _LT_CONFIG_COMMANDS
])# _LT_SETUP
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
+
# _LT_PROG_LTMAIN
# ---------------
# Note that this code is called both from `configure', and `config.status'
@@ -408,7 +423,7 @@ m4_define([_lt_decl_all_varnames],
# declaration there will have the same value as in `configure'. VARNAME
# must have a single quote delimited value for this to work.
m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
# _LT_CONFIG_STATUS_DECLARATIONS
@@ -418,7 +433,7 @@ m4_define([_LT_CONFIG_STATUS_DECLARE],
# embedded single quotes properly. In configure, this macro expands
# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
#
-# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
+# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
[m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
@@ -517,12 +532,20 @@ LTCC='$LTCC'
LTCFLAGS='$LTCFLAGS'
compiler='$compiler_DEFAULT'
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+ eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
# Quote evaled strings.
for var in lt_decl_all_varnames([[ \
]], lt_decl_quote_varnames); do
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -533,9 +556,9 @@ done
# Double-quote double-evaled strings.
for var in lt_decl_all_varnames([[ \
]], lt_decl_dquote_varnames); do
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -543,16 +566,38 @@ for var in lt_decl_all_varnames([[ \
esac
done
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\[$]0 --fallback-echo"')dnl "
- lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
- ;;
-esac
-
_LT_OUTPUT_LIBTOOL_INIT
])
+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable. If COMMENT is supplied, it is inserted after the
+# `#!' sequence but before initialization text begins. After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script. The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef([AS_INIT_GENERATED],
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+[m4_defun([_LT_GENERATED_FILE_INIT],
+[m4_require([AS_PREPARE])]dnl
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+[lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test $lt_write_fail = 0 && chmod +x $1[]dnl
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
# LT_OUTPUT
# ---------
@@ -562,20 +607,11 @@ _LT_OUTPUT_LIBTOOL_INIT
AC_DEFUN([LT_OUTPUT],
[: ${CONFIG_LT=./config.lt}
AC_MSG_NOTICE([creating $CONFIG_LT])
-cat >"$CONFIG_LT" <<_LTEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate a libtool stub with the current configuration.
-
-lt_cl_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_LTEOF
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
cat >>"$CONFIG_LT" <<\_LTEOF
-AS_SHELL_SANITIZE
-_AS_PREPARE
-
-exec AS_MESSAGE_FD>&1
+lt_cl_silent=false
exec AS_MESSAGE_LOG_FD>>config.log
{
echo
@@ -601,7 +637,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_
m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
configured by $[0], generated by m4_PACKAGE_STRING.
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
This config.lt script is free software; the Free Software Foundation
gives unlimited permision to copy, distribute and modify it."
@@ -646,15 +682,13 @@ chmod +x "$CONFIG_LT"
# appending to config.log, which fails on DOS, as config.log is still kept
# open by configure. Here we exec the FD to /dev/null, effectively closing
# config.log, so it can be properly (re)opened and appended to by config.lt.
-if test "$no_create" != yes; then
- lt_cl_success=:
- test "$silent" = yes &&
- lt_config_lt_args="$lt_config_lt_args --quiet"
- exec AS_MESSAGE_LOG_FD>/dev/null
- $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
- exec AS_MESSAGE_LOG_FD>>config.log
- $lt_cl_success || AS_EXIT(1)
-fi
+lt_cl_success=:
+test "$silent" = yes &&
+ lt_config_lt_args="$lt_config_lt_args --quiet"
+exec AS_MESSAGE_LOG_FD>/dev/null
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
])# LT_OUTPUT
@@ -717,15 +751,12 @@ _LT_EOF
# if finds mixed CR/LF and LF-only lines. Since sed operates in
# text mode, it properly converts lines to CR/LF. This bash problem
# is reportedly fixed, but why not run on old versions too?
- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
- || (rm -f "$cfgfile"; exit 1)
+ sed '$q' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
- _LT_PROG_XSI_SHELLFNS
+ _LT_PROG_REPLACE_SHELLFNS
- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
- || (rm -f "$cfgfile"; exit 1)
-
- mv -f "$cfgfile" "$ofile" ||
+ mv -f "$cfgfile" "$ofile" ||
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
],
@@ -831,11 +862,13 @@ AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)
AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
dnl aclocal-1.4 backwards compatibility:
dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
dnl AC_DEFUN([AC_LIBTOOL_F77], [])
dnl AC_DEFUN([AC_LIBTOOL_FC], [])
dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
# _LT_TAG_COMPILER
@@ -940,6 +973,31 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECK
[lt_cv_ld_exported_symbols_list=no])
LDFLAGS="$save_LDFLAGS"
])
+ AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+ [lt_cv_ld_force_load=no
+ cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+ echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+ $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+ cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+ _lt_result=$?
+ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+ lt_cv_ld_force_load=yes
+ else
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+ fi
+ rm -f conftest.err libconftest.a conftest conftest.c
+ rm -rf conftest.dSYM
+ ])
case $host_os in
rhapsody* | darwin1.[[012]])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -967,7 +1025,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECK
else
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
- if test "$DSYMUTIL" != ":"; then
+ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
@@ -987,7 +1045,11 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_automatic, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+ if test "$lt_cv_ld_force_load" = "yes"; then
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ else
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+ fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
case $cc_basename in
@@ -995,7 +1057,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
- output_verbose_link_cmd=echo
+ output_verbose_link_cmd=func_echo_all
_LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
_LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
_LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -1011,203 +1073,142 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
fi
])
-# _LT_SYS_MODULE_PATH_AIX
-# -----------------------
+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
+# ----------------------------------
# Links a minimal program and checks the executable
# for the system default hardcoded library path. In most cases,
# this is /usr/lib:/lib, but when the MPI compilers are used
# the location of the communication and MPI libs are included too.
# If we don't find anything, use the default library path according
# to the aix ld manual.
+# Store the results from the different compilers for each TAGNAME.
+# Allow to override them for all tags through lt_cv_aix_libpath.
m4_defun([_LT_SYS_MODULE_PATH_AIX],
[m4_require([_LT_DECL_SED])dnl
-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
- /^0/ {
- s/^0 *\(.*\)$/\1/
- p
- }
- }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+if test "${lt_cv_aix_libpath+set}" = set; then
+ aix_libpath=$lt_cv_aix_libpath
+else
+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+ lt_aix_libpath_sed='[
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\([^ ]*\) *$/\1/
+ p
+ }
+ }]'
+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi],[])
+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
+ fi
+ ])
+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+fi
])# _LT_SYS_MODULE_PATH_AIX
# _LT_SHELL_INIT(ARG)
# -------------------
m4_define([_LT_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
- [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_SHELL_INIT
+[m4_divert_text([M4SH-INIT], [$1
+])])# _LT_SHELL_INIT
+
# _LT_PROG_ECHO_BACKSLASH
# -----------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
+# Find how we can fake an echo command that does not interpret backslash.
+# In particular, with Autoconf 2.60 or later we add some code to the start
+# of the generated configure script which will find a shell with a builtin
+# printf (which we can use as an echo command).
m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[_LT_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$lt_ECHO in
-X*--fallback-echo)
- # Remove one level of quotation (which was required for Make).
- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
- ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
-elif test "X[$]1" = X--fallback-echo; then
- # Avoid inline document here, it may be left over
- :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
- # Yippee, $ECHO works!
- :
+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING([how to print strings])
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+ ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+ ECHO='printf %s\n'
else
- # Restart under the correct shell.
- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
-
-if test "X[$]1" = X--fallback-echo; then
- # used as fallback echo
- shift
- cat <<_LT_EOF
-[$]*
-_LT_EOF
- exit 0
+ # Use this function as a fallback that always works.
+ func_fallback_echo ()
+ {
+ eval 'cat <<_LTECHO_EOF
+$[]1
+_LTECHO_EOF'
+ }
+ ECHO='func_fallback_echo'
fi
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
- if test "X${echo_test_string+set}" != Xset; then
- # find a string as large as possible, as long as the shell can cope with it
- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
- if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
- then
- break
- fi
- done
- fi
-
- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- :
- else
- # The Solaris, AIX, and Digital Unix default echo programs unquote
- # backslashes. This makes it impossible to quote backslashes using
- # echo "$something" | sed 's/\\/\\\\/g'
- #
- # So, first we look for a working echo in the user's PATH.
-
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for dir in $PATH /usr/ucb; do
- IFS="$lt_save_ifs"
- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- ECHO="$dir/echo"
- break
- fi
- done
- IFS="$lt_save_ifs"
-
- if test "X$ECHO" = Xecho; then
- # We didn't find a better echo, so look for alternatives.
- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # This shell has a builtin print -r that does the trick.
- ECHO='print -r'
- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
- test "X$CONFIG_SHELL" != X/bin/ksh; then
- # If we have ksh, try running configure again with it.
- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
- export ORIGINAL_CONFIG_SHELL
- CONFIG_SHELL=/bin/ksh
- export CONFIG_SHELL
- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
- else
- # Try using printf.
- ECHO='printf %s\n'
- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # Cool, printf works
- :
- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
- export CONFIG_SHELL
- SHELL="$CONFIG_SHELL"
- export SHELL
- ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
- else
- # maybe with a smaller string...
- prev=:
-
- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
- then
- break
- fi
- prev="$cmd"
- done
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+ $ECHO "$*"
+}
- if test "$prev" != 'sed 50q "[$]0"'; then
- echo_test_string=`eval $prev`
- export echo_test_string
- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
- else
- # Oops. We lost completely, so just stick with echo.
- ECHO=echo
- fi
- fi
- fi
- fi
- fi
-fi
+case "$ECHO" in
+ printf*) AC_MSG_RESULT([printf]) ;;
+ print*) AC_MSG_RESULT([print -r]) ;;
+ *) AC_MSG_RESULT([cat]) ;;
+esac
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
- lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
+m4_ifdef([_AS_DETECT_SUGGESTED],
+[_AS_DETECT_SUGGESTED([
+ test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+ PATH=/empty FPATH=/empty; export PATH FPATH
+ test "X`printf %s $ECHO`" = "X$ECHO" \
+ || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
-AC_SUBST(lt_ECHO)
-])
_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1],
- [An echo program that does not interpret backslashes])
+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
])# _LT_PROG_ECHO_BACKSLASH
+# _LT_WITH_SYSROOT
+# ----------------
+AC_DEFUN([_LT_WITH_SYSROOT],
+[AC_MSG_CHECKING([for sysroot])
+AC_ARG_WITH([sysroot],
+[ --with-sysroot[=DIR] Search for dependent libraries within DIR
+ (or the compiler's sysroot if not specified).],
+[], [with_sysroot=no])
+
+dnl lt_sysroot will always be passed unquoted. We quote it here
+dnl in case the user passed a directory name.
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+ if test "$GCC" = yes; then
+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+ fi
+ ;; #(
+ /*)
+ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+ ;; #(
+ no|'')
+ ;; #(
+ *)
+ AC_MSG_RESULT([${with_sysroot}])
+ AC_MSG_ERROR([The sysroot must be an absolute path.])
+ ;;
+esac
+
+ AC_MSG_RESULT([${lt_sysroot:-no}])
+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
+[dependent libraries, and in which our libraries should be installed.])])
+
# _LT_ENABLE_LOCK
# ---------------
m4_defun([_LT_ENABLE_LOCK],
@@ -1236,7 +1237,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
@@ -1354,14 +1355,47 @@ need_locks="$enable_libtool_lock"
])# _LT_ENABLE_LOCK
+# _LT_PROG_AR
+# -----------
+m4_defun([_LT_PROG_AR],
+[AC_CHECK_TOOLS(AR, [ar], false)
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+
+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
+ [lt_cv_ar_at_file=no
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+ [echo conftest.$ac_objext > conftest.lst
+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+ AC_TRY_EVAL([lt_ar_try])
+ if test "$ac_status" -eq 0; then
+ # Ensure the archiver fails upon bogus file names.
+ rm -f conftest.$ac_objext libconftest.a
+ AC_TRY_EVAL([lt_ar_try])
+ if test "$ac_status" -ne 0; then
+ lt_cv_ar_at_file=@
+ fi
+ fi
+ rm -f conftest.* libconftest.a
+ ])
+ ])
+
+if test "x$lt_cv_ar_at_file" = xno; then
+ archiver_list_spec=
+else
+ archiver_list_spec=$lt_cv_ar_at_file
+fi
+_LT_DECL([], [archiver_list_spec], [1],
+ [How to feed a file listing to the archiver])
+])# _LT_PROG_AR
+
+
# _LT_CMD_OLD_ARCHIVE
# -------------------
m4_defun([_LT_CMD_OLD_ARCHIVE],
-[AC_CHECK_TOOL(AR, ar, false)
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1])
+[_LT_PROG_AR
AC_CHECK_TOOL(STRIP, strip, :)
test -z "$STRIP" && STRIP=:
@@ -1388,10 +1422,19 @@ if test -n "$RANLIB"; then
esac
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
+
+case $host_os in
+ darwin*)
+ lock_old_archive_extraction=yes ;;
+ *)
+ lock_old_archive_extraction=no ;;
+esac
_LT_DECL([], [old_postinstall_cmds], [2])
_LT_DECL([], [old_postuninstall_cmds], [2])
_LT_TAGDECL([], [old_archive_cmds], [2],
[Commands used to build an old-style archive])
+_LT_DECL([], [lock_old_archive_extraction], [0],
+ [Whether to use a lock for old archive extraction])
])# _LT_CMD_OLD_ARCHIVE
@@ -1416,15 +1459,15 @@ AC_CACHE_CHECK([$1], [$2],
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&AS_MESSAGE_LOG_FD
- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
@@ -1464,7 +1507,7 @@ AC_CACHE_CHECK([$1], [$2],
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&AS_MESSAGE_LOG_FD
- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
@@ -1527,6 +1570,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
lt_cv_sys_max_cmd_len=8192;
;;
+ mint*)
+ # On MiNT this can take a long time and run out of memory.
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
@@ -1591,8 +1639,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
- = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+ = "X$teststring$teststring"; } >/dev/null 2>&1 &&
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
@@ -1643,7 +1691,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-[#line __oline__ "configure"
+[#line $LINENO "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -1684,7 +1732,13 @@ else
# endif
#endif
-void fnord() { int i=42;}
+/* When -fvisbility=hidden is used, assume the code has been annotated
+ correspondingly for the symbols needed. */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -1693,7 +1747,11 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else
+ {
+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else puts (dlerror ());
+ }
/* dlclose (self); */
}
else
@@ -1869,16 +1927,16 @@ AC_CACHE_CHECK([if $compiler supports -c
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&AS_MESSAGE_LOG_FD
- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
@@ -2037,6 +2095,7 @@ m4_require([_LT_DECL_EGREP])dnl
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_OBJDUMP])dnl
m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
AC_MSG_CHECKING([dynamic linker characteristics])
m4_if([$1],
[], [
@@ -2045,16 +2104,23 @@ if test "$GCC" = yes; then
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+ case $host_os in
+ mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
+ *) lt_sed_strip_eq="s,=/,/,g" ;;
+ esac
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+ case $lt_search_path_spec in
+ *\;*)
# if the path contains ";" then we assume it to be the separator
# otherwise default to the standard path separator (i.e. ":") - it is
# assumed that no part of a normal pathname contains ";" but that should
# okay in the real world where ";" in dirpaths is itself problematic.
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
- else
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+ ;;
+ *)
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+ ;;
+ esac
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
@@ -2067,7 +2133,7 @@ if test "$GCC" = yes; then
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
- lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
@@ -2087,7 +2153,13 @@ BEGIN {RS=" "; FS="/|\n";} {
if (lt_foo != "") { lt_freq[[lt_foo]]++; }
if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
}'`
- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+ # AWK program above erroneously prepends '/' to C:/dos/paths
+ # for these hosts.
+ case $host_os in
+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+ $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
+ esac
+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi])
@@ -2175,7 +2247,7 @@ amigaos*)
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
;;
esac
;;
@@ -2206,8 +2278,9 @@ cygwin* | mingw* | pw32* | cegcc*)
need_version=no
need_lib_prefix=no
- case $GCC,$host_os in
- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+ case $GCC,$cc_basename in
+ yes,*)
+ # gcc
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
@@ -2228,36 +2301,83 @@ cygwin* | mingw* | pw32* | cegcc*)
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+m4_if([$1], [],[
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
- # It is most probably a Windows format PATH printed by
- # mingw gcc, but we are running on Cygwin. Gcc prints its search
- # path with ; separators, and with drive letters. We can handle the
- # drive letters (cygwin fileutils understands them), so leave them,
- # especially as we might pass files found there to a mingw objdump,
- # which wouldn't understand a cygwinified path. Ahh.
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
;;
esac
+ dynamic_linker='Win32 ld.exe'
+ ;;
+
+ *,cl*)
+ # Native MSVC
+ libname_spec='$name'
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ library_names_spec='${libname}.dll.lib'
+
+ case $build_os in
+ mingw*)
+ sys_lib_search_path_spec=
+ lt_save_ifs=$IFS
+ IFS=';'
+ for lt_path in $LIB
+ do
+ IFS=$lt_save_ifs
+ # Let DOS variable expansion print the short 8.3 style file name.
+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+ done
+ IFS=$lt_save_ifs
+ # Convert to MSYS style.
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
+ ;;
+ cygwin*)
+ # Convert to unix form, then to dos form, then back to unix form
+ # but this time dos style (no spaces!) so that the unix form looks
+ # like /cygdrive/c/PROGRA~1:/cygdr...
+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ ;;
+ *)
+ sys_lib_search_path_spec="$LIB"
+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+ # It is most probably a Windows format PATH.
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+ else
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
+ # FIXME: find the short name or the path components, as spaces are
+ # common. (e.g. "Program Files" -> "PROGRA~1")
+ ;;
+ esac
+
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
+ postinstall_cmds='base_file=`basename \${file}`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
+ shlibpath_overrides_runpath=yes
+ dynamic_linker='Win32 link.exe'
;;
*)
+ # Assume MSVC wrapper
library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ dynamic_linker='Win32 ld.exe'
;;
esac
- dynamic_linker='Win32 ld.exe'
# FIXME: first we should search . and the directory the executable is in
shlibpath_var=PATH
;;
@@ -2341,6 +2461,20 @@ gnu*)
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
+haiku*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ dynamic_linker="$host_os runtime_loader"
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
hardcode_into_libs=yes
;;
@@ -2386,8 +2520,10 @@ hpux9* | hpux10* | hpux11*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
postinstall_cmds='chmod 555 $lib'
+ # or fails outright, so override atomically:
+ install_override_mode=555
;;
interix[[3-9]]*)
@@ -2454,16 +2590,21 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
+
# Some binutils ld are patched to set DT_RUNPATH
- save_LDFLAGS=$LDFLAGS
- save_libdir=$libdir
- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
- LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
- [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
- [shlibpath_overrides_runpath=yes])])
- LDFLAGS=$save_LDFLAGS
- libdir=$save_libdir
+ AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+ [lt_cv_shlibpath_overrides_runpath=no
+ save_LDFLAGS=$LDFLAGS
+ save_libdir=$libdir
+ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+ [lt_cv_shlibpath_overrides_runpath=yes])])
+ LDFLAGS=$save_LDFLAGS
+ libdir=$save_libdir
+ ])
+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
@@ -2472,7 +2613,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -2717,6 +2858,8 @@ _LT_DECL([], [library_names_spec], [1],
The last name is the one that the linker finds with -lNAME]])
_LT_DECL([], [soname_spec], [1],
[[The coded name of the library, if different from the real name]])
+_LT_DECL([], [install_override_mode], [1],
+ [Permission mode override for installation of shared libraries])
_LT_DECL([], [postinstall_cmds], [2],
[Command to use after installation of a shared archive])
_LT_DECL([], [postuninstall_cmds], [2],
@@ -2829,6 +2972,7 @@ AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
m4_require([_LT_DECL_SED])dnl
m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
AC_ARG_WITH([gnu-ld],
[AS_HELP_STRING([--with-gnu-ld],
@@ -2950,6 +3094,11 @@ case $reload_flag in
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
+ cygwin* | mingw* | pw32* | cegcc*)
+ if test "$GCC" != yes; then
+ reload_cmds=false
+ fi
+ ;;
darwin*)
if test "$GCC" = yes; then
reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
@@ -2958,8 +3107,8 @@ case $host_os in
fi
;;
esac
-_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_DECL([], [reload_cmds], [2])dnl
+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_TAGDECL([], [reload_cmds], [2])dnl
])# _LT_CMD_RELOAD
@@ -3011,16 +3160,18 @@ mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
- if ( file / ) >/dev/null 2>&1; then
+ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
else
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+ # Keep this pattern in sync with the one in func_win32_libid.
+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
lt_cv_file_magic_cmd='$OBJDUMP -f'
fi
;;
-cegcc)
+cegcc*)
# use the weaker test based on 'objdump'. See mingw*.
lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -3050,6 +3201,10 @@ gnu*)
lt_cv_deplibs_check_method=pass_all
;;
+haiku*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
@@ -3058,11 +3213,11 @@ hpux10.20* | hpux11*)
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
;;
*)
- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
@@ -3162,6 +3317,21 @@ tpf*)
;;
esac
])
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+ case $host_os in
+ mingw* | pw32*)
+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+ want_nocaseglob=yes
+ else
+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
+ fi
+ ;;
+ esac
+fi
+
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -3169,7 +3339,11 @@ test -z "$deplibs_check_method" && depli
_LT_DECL([], [deplibs_check_method], [1],
[Method to check whether dependent libraries are shared objects])
_LT_DECL([], [file_magic_cmd], [1],
- [Command to use when deplibs_check_method == "file_magic"])
+ [Command to use when deplibs_check_method = "file_magic"])
+_LT_DECL([], [file_magic_glob], [1],
+ [How to find potential files when deplibs_check_method = "file_magic"])
+_LT_DECL([], [want_nocaseglob], [1],
+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
])# _LT_CHECK_MAGIC_METHOD
@@ -3226,7 +3400,19 @@ if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
else
# Didn't find any BSD compatible name lister, look for dumpbin.
- AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
+ if test -n "$DUMPBIN"; then :
+ # Let the user override the test.
+ else
+ AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+ *COFF*)
+ DUMPBIN="$DUMPBIN -symbols"
+ ;;
+ *)
+ DUMPBIN=:
+ ;;
+ esac
+ fi
AC_SUBST([DUMPBIN])
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
@@ -3239,13 +3425,13 @@ _LT_DECL([], [NM], [1], [A BSD- or MS-co
AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
[lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&AS_MESSAGE_LOG_FD
- (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&AS_MESSAGE_LOG_FD
- (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
cat conftest.out >&AS_MESSAGE_LOG_FD
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -3260,6 +3446,67 @@ dnl aclocal-1.4 backwards compatibility:
dnl AC_DEFUN([AM_PROG_NM], [])
dnl AC_DEFUN([AC_PROG_NM], [])
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# --------------------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+# -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+m4_require([_LT_DECL_DLLTOOL])
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+ # two different shell functions defined in ltmain.sh
+ # decide which to use based on capabilities of $DLLTOOL
+ case `$DLLTOOL --help 2>&1` in
+ *--identify-strict*)
+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+ ;;
+ *)
+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+ ;;
+ esac
+ ;;
+*)
+ # fallback: assume linklib IS sharedlib
+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+ ;;
+esac
+])
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
+ [Command to associate shared and link libraries])
+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+
+
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun([_LT_PATH_MANIFEST_TOOL],
+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+ [lt_cv_path_mainfest_tool=no
+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+ lt_cv_path_mainfest_tool=yes
+ fi
+ rm -f conftest*])
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+ MANIFEST_TOOL=:
+fi
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+])# _LT_PATH_MANIFEST_TOOL
+
# LT_LIB_M
# --------
@@ -3268,7 +3515,7 @@ AC_DEFUN([LT_LIB_M],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
LIBM=
case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
# These system don't have libm, or don't need it
;;
*-ncr-sysv4.3*)
@@ -3296,7 +3543,12 @@ m4_defun([_LT_COMPILER_NO_RTTI],
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
if test "$GCC" = yes; then
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+ case $cc_basename in
+ nvcc*)
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+ *)
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+ esac
_LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
lt_cv_prog_compiler_rtti_exceptions,
@@ -3313,6 +3565,7 @@ _LT_TAGDECL([no_builtin_flag], [lt_prog_
m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([LT_PATH_NM])dnl
AC_REQUIRE([LT_PATH_LD])dnl
m4_require([_LT_DECL_SED])dnl
@@ -3380,8 +3633,8 @@ esac
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
# Handle CRLF in mingw tool chain
opt_cr=
@@ -3417,6 +3670,7 @@ for ac_symprfx in "" "_"; do
else
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
fi
+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
# Check to see that the pipe works correctly.
pipe_works=no
@@ -3438,7 +3692,7 @@ _LT_EOF
if AC_TRY_EVAL(ac_compile); then
# Now try to grab the symbols.
nlist=conftest.nm
- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+ if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
@@ -3450,6 +3704,18 @@ _LT_EOF
if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+ relocations are performed -- see ld's documentation on pseudo-relocs. */
+# define LT@&t@_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data. */
+# define LT@&t@_DLSYM_CONST
+#else
+# define LT@&t@_DLSYM_CONST const
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -3461,7 +3727,7 @@ _LT_EOF
cat <<_LT_EOF >> conftest.$ac_ext
/* The mapping between symbol names and symbols. */
-const struct {
+LT@&t@_DLSYM_CONST struct {
const char *name;
void *address;
}
@@ -3487,15 +3753,15 @@ static const void *lt_preloaded_setup()
_LT_EOF
# Now try linking the two files.
mv conftest.$ac_objext conftstm.$ac_objext
- lt_save_LIBS="$LIBS"
- lt_save_CFLAGS="$CFLAGS"
+ lt_globsym_save_LIBS=$LIBS
+ lt_globsym_save_CFLAGS=$CFLAGS
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
pipe_works=yes
fi
- LIBS="$lt_save_LIBS"
- CFLAGS="$lt_save_CFLAGS"
+ LIBS=$lt_globsym_save_LIBS
+ CFLAGS=$lt_globsym_save_CFLAGS
else
echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
fi
@@ -3528,6 +3794,13 @@ else
AC_MSG_RESULT(ok)
fi
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+ nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
+ nm_file_list_spec='@'
+fi
+
_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
[Take the output of nm and produce a listing of raw symbols and C names])
_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
@@ -3538,6 +3811,8 @@ _LT_DECL([global_symbol_to_c_name_addres
_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
[lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
[Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([], [nm_file_list_spec], [1],
+ [Specify filename containing input files for $NM])
]) # _LT_CMD_GLOBAL_SYMBOLS
@@ -3549,7 +3824,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_TAGVAR(lt_prog_compiler_static, $1)=
-AC_MSG_CHECKING([for $compiler option to produce PIC])
m4_if([$1], [CXX], [
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
@@ -3600,6 +3874,11 @@ m4_if([$1], [CXX], [
# DJGPP does not support shared libraries at all
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
;;
+ haiku*)
+ # PIC is the default for Haiku.
+ # The "-static" flag exists, but is broken.
+ _LT_TAGVAR(lt_prog_compiler_static, $1)=
+ ;;
interix[[3-9]]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
@@ -3649,6 +3928,12 @@ m4_if([$1], [CXX], [
;;
esac
;;
+ mingw* | cygwin* | os2* | pw32* | cegcc*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ m4_if([$1], [GCJ], [],
+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
dgux*)
case $cc_basename in
ec++*)
@@ -3738,8 +4023,8 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- xlc* | xlC*)
- # IBM XL 8.0 on PPC
+ xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+ # IBM XL 8.0, 9.0 on PPC and BlueGene
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
@@ -3801,7 +4086,7 @@ m4_if([$1], [CXX], [
;;
solaris*)
case $cc_basename in
- CC*)
+ CC* | sunCC*)
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -3905,6 +4190,12 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
+ haiku*)
+ # PIC is the default for Haiku.
+ # The "-static" flag exists, but is broken.
+ _LT_TAGVAR(lt_prog_compiler_static, $1)=
+ ;;
+
hpux*)
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
@@ -3947,6 +4238,13 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
esac
+
+ case $cc_basename in
+ nvcc*) # Cuda Compiler Driver 2.2
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+ ;;
+ esac
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
@@ -4010,7 +4308,13 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
;;
- pgcc* | pgf77* | pgf90* | pgf95*)
+ nagfor*)
+ # NAG Fortran compiler
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -4022,25 +4326,25 @@ m4_if([$1], [CXX], [
# All Alpha code is PIC.
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- xl*)
- # IBM XL C 8.0/Fortran 10.1 on PPC
+ xl* | bgxl* | bgf* | mpixl*)
+ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
;;
*)
case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C 5.9
+ *Sun\ F* | *Sun*Fortran*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
;;
- *Sun\ F*)
- # Sun Fortran 8.3 passes all unrecognized flags to the linker
+ *Sun\ C*)
+ # Sun C 5.9
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
;;
esac
;;
@@ -4072,7 +4376,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
case $cc_basename in
- f77* | f90* | f95*)
+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
@@ -4129,9 +4433,11 @@ case $host_os in
_LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
;;
esac
-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
- [How to pass a linker flag through the compiler])
+
+AC_CACHE_CHECK([for $compiler option to produce PIC],
+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
#
# Check to make sure the PIC flag actually works.
@@ -4150,6 +4456,8 @@ fi
_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
[Additional compiler flags for building library objects])
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+ [How to pass a linker flag through the compiler])
#
# Check to make sure the static flag actually works.
#
@@ -4170,6 +4478,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog
m4_defun([_LT_LINKER_SHLIBS],
[AC_REQUIRE([LT_PATH_LD])dnl
AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_EGREP])dnl
m4_require([_LT_DECL_SED])dnl
@@ -4178,30 +4487,38 @@ m4_require([_LT_TAG_COMPILER])dnl
AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
m4_if([$1], [CXX], [
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
case $host_os in
aix[[4-9]]*)
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
+ # Also, AIX nm treats weak defined symbols like other global defined
+ # symbols, whereas GNU nm marks them as "W".
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
else
_LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
;;
pw32*)
_LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
- ;;
+ ;;
cygwin* | mingw* | cegcc*)
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
- linux* | k*bsd*-gnu)
+ case $cc_basename in
+ cl*) ;;
+ *)
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+ ;;
+ esac
+ ;;
+ linux* | k*bsd*-gnu | gnu*)
_LT_TAGVAR(link_all_deplibs, $1)=no
- ;;
+ ;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
+ ;;
esac
- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
], [
runpath_var=
_LT_TAGVAR(allow_undefined_flag, $1)=
@@ -4261,13 +4578,39 @@ dnl Note also adjust exclude_expsyms for
openbsd*)
with_gnu_ld=no
;;
- linux* | k*bsd*-gnu)
+ linux* | k*bsd*-gnu | gnu*)
_LT_TAGVAR(link_all_deplibs, $1)=no
;;
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
+
+ # On some targets, GNU ld is compatible enough with the native linker
+ # that we're better off using the native interface for both.
+ lt_use_gnu_ld_interface=no
if test "$with_gnu_ld" = yes; then
+ case $host_os in
+ aix*)
+ # The AIX port of GNU ld has always aspired to compatibility
+ # with the native linker. However, as the warning in the GNU ld
+ # block says, versions before 2.19.5* couldn't really create working
+ # shared libraries, regardless of the interface used.
+ case `$LD -v 2>&1` in
+ *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+ *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
+ *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
+ *)
+ lt_use_gnu_ld_interface=yes
+ ;;
+ esac
+ ;;
+ *)
+ lt_use_gnu_ld_interface=yes
+ ;;
+ esac
+ fi
+
+ if test "$lt_use_gnu_ld_interface" = yes; then
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -4301,11 +4644,12 @@ dnl Note also adjust exclude_expsyms for
_LT_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** Warning: the GNU linker, at least up to release 2.19, is reported
*** to be unable to reliably create shared libraries on AIX.
*** Therefore, libtool is disabling shared libraries support. If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
_LT_EOF
fi
@@ -4341,10 +4685,12 @@ _LT_EOF
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(always_export_symbols, $1)=no
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -4362,6 +4708,11 @@ _LT_EOF
fi
;;
+ haiku*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
interix[[3-9]]*)
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -4387,15 +4738,16 @@ _LT_EOF
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
&& test "$tmp_diet" = no
then
- tmp_addflag=
+ tmp_addflag=' $pic_flag'
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ pgf77* | pgf90* | pgf95* | pgfortran*)
+ # Portland Group f77 and f90 compilers
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -4406,13 +4758,17 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
_LT_TAGVAR(whole_archive_flag_spec, $1)=
tmp_sharedflag='--shared' ;;
- xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
tmp_sharedflag='-qmkshrobj'
tmp_addflag= ;;
+ nvcc*) # Cuda Compiler Driver 2.2
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(compiler_needs_object, $1)=yes
+ ;;
esac
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*) # Sun C 5.9
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
@@ -4428,17 +4784,17 @@ _LT_EOF
fi
case $cc_basename in
- xlf*)
+ xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
_LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
if test "x$supports_anon_versioning" = xyes; then
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
echo "local: *; };" >> $output_objdir/$libname.ver~
- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
fi
;;
esac
@@ -4452,8 +4808,8 @@ _LT_EOF
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
fi
;;
@@ -4471,8 +4827,8 @@ _LT_EOF
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -4518,8 +4874,8 @@ _LT_EOF
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -4559,8 +4915,10 @@ _LT_EOF
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
+ # Also, AIX nm treats weak defined symbols like other global
+ # defined symbols, whereas GNU nm marks them as "W".
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
else
_LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
@@ -4648,9 +5006,9 @@ _LT_EOF
_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
- _LT_SYS_MODULE_PATH_AIX
+ _LT_SYS_MODULE_PATH_AIX([$1])
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
@@ -4659,14 +5017,19 @@ _LT_EOF
else
# Determine the default libpath from the value encoded in an
# empty executable.
- _LT_SYS_MODULE_PATH_AIX
+ _LT_SYS_MODULE_PATH_AIX([$1])
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- # Exported symbols can be pulled into shared objects from archives
- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ if test "$with_gnu_ld" = yes; then
+ # We only use this code for GNU lds that support --whole-archive.
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ else
+ # Exported symbols can be pulled into shared objects from archives
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ fi
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds its shared libraries.
_LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
@@ -4698,20 +5061,63 @@ _LT_EOF
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
- # The linker will automatically build a .lib file if we build a DLL.
- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
- # FIXME: Should let the user specify the lib program.
- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ case $cc_basename in
+ cl*)
+ # Native MSVC
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_TAGVAR(always_export_symbols, $1)=yes
+ _LT_TAGVAR(file_list_spec, $1)='@'
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+ else
+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+ fi~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
+ # The linker will not automatically build a static lib if we build a DLL.
+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+ # Don't use ranlib
+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile="$lt_outputfile.exe"
+ lt_tool_outputfile="$lt_tool_outputfile.exe"
+ ;;
+ esac~
+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
+ ;;
+ *)
+ # Assume MSVC wrapper
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+ # The linker will automatically build a .lib file if we build a DLL.
+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+ # FIXME: Should let the user specify the lib program.
+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+ esac
;;
darwin* | rhapsody*)
@@ -4749,7 +5155,7 @@ _LT_EOF
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
freebsd* | dragonfly*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -4757,7 +5163,7 @@ _LT_EOF
hpux9*)
if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
else
_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
@@ -4772,8 +5178,8 @@ _LT_EOF
;;
hpux10*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
fi
@@ -4791,16 +5197,16 @@ _LT_EOF
;;
hpux11*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
case $host_cpu in
hppa*64*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
@@ -4812,7 +5218,14 @@ _LT_EOF
_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ m4_if($1, [], [
+ # Older versions of the 11.00 compiler do not understand -b yet
+ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+ _LT_LINKER_OPTION([if $CC understands -b],
+ _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+ [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
;;
esac
fi
@@ -4840,19 +5253,34 @@ _LT_EOF
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- AC_LINK_IFELSE(int foo(void) {},
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
- )
- LDFLAGS="$save_LDFLAGS"
+ # This should be the same for all languages, so no per-tag cache variable.
+ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
+ [lt_cv_irix_exported_symbol],
+ [save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+ AC_LINK_IFELSE(
+ [AC_LANG_SOURCE(
+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+ [C++], [[int foo (void) { return 0; }]],
+ [Fortran 77], [[
+ subroutine foo
+ end]],
+ [Fortran], [[
+ subroutine foo
+ end]])])],
+ [lt_cv_irix_exported_symbol=yes],
+ [lt_cv_irix_exported_symbol=no])
+ LDFLAGS="$save_LDFLAGS"])
+ if test "$lt_cv_irix_exported_symbol" = yes; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+ fi
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -4914,17 +5342,17 @@ _LT_EOF
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_TAGVAR(hardcode_minus_L, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
_LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
;;
osf3*)
if test "$GCC" = yes; then
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -4934,13 +5362,13 @@ _LT_EOF
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
else
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
# Both c and cxx compiler support -rpath directly
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -4953,9 +5381,9 @@ _LT_EOF
_LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
if test "$GCC" = yes; then
wlarc='${wl}'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
else
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
@@ -5131,36 +5559,38 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
- AC_MSG_CHECKING([whether -lc should be explicitly linked in])
- $RM conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
- soname=conftest
- lib=conftest
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
- pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
- compiler_flags=-v
- linker_flags=-v
- verstring=
- output_objdir=.
- libname=conftest
- lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
- _LT_TAGVAR(allow_undefined_flag, $1)=
- if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
- then
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- else
- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- fi
- _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
- else
- cat conftest.err 1>&5
- fi
- $RM conftest*
- AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
+ AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+ [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+ [$RM conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+ soname=conftest
+ lib=conftest
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+ pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+ output_objdir=.
+ libname=conftest
+ lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+ _LT_TAGVAR(allow_undefined_flag, $1)=
+ if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+ then
+ lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ else
+ lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+ fi
+ _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+ else
+ cat conftest.err 1>&5
+ fi
+ $RM conftest*
+ ])
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
;;
esac
fi
@@ -5225,8 +5655,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],
to runtime path list])
_LT_TAGDECL([], [link_all_deplibs], [0],
[Whether libtool must link a program against all its dependency libraries])
-_LT_TAGDECL([], [fix_srcfile_path], [1],
- [Fix the shell variable $srcfile for the compiler])
_LT_TAGDECL([], [always_export_symbols], [0],
[Set to "yes" if exported symbols are required])
_LT_TAGDECL([], [export_symbols_cmds], [2],
@@ -5237,6 +5665,8 @@ _LT_TAGDECL([], [include_expsyms], [1],
[Symbols that must always be exported])
_LT_TAGDECL([], [prelink_cmds], [2],
[Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [postlink_cmds], [2],
+ [Commands necessary for finishing linking programs])
_LT_TAGDECL([], [file_list_spec], [1],
[Specify filename containing input files])
dnl FIXME: Not yet implemented
@@ -5330,37 +5760,22 @@ CC="$lt_save_CC"
])# _LT_LANG_C_CONFIG
-# _LT_PROG_CXX
-# ------------
-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
-# compiler, we have our own version here.
-m4_defun([_LT_PROG_CXX],
-[
-pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
-AC_PROG_CXX
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
- AC_PROG_CXXCPP
-else
- _lt_caught_CXX_error=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_CXX
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_CXX], [])
-
-
# _LT_LANG_CXX_CONFIG([TAG])
# --------------------------
# Ensure that the configuration variables for a C++ compiler are suitably
# defined. These variables are subsequently used by _LT_CONFIG to write
# the compiler configuration to `libtool'.
m4_defun([_LT_LANG_CXX_CONFIG],
-[AC_REQUIRE([_LT_PROG_CXX])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+ (test "X$CXX" != "Xg++"))) ; then
+ AC_PROG_CXXCPP
+else
+ _lt_caught_CXX_error=yes
+fi
AC_LANG_PUSH(C++)
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -5382,6 +5797,8 @@ _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
@@ -5413,6 +5830,7 @@ if test "$_lt_caught_CXX_error" != yes;
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
+ lt_save_CFLAGS=$CFLAGS
lt_save_LD=$LD
lt_save_GCC=$GCC
GCC=$GXX
@@ -5430,6 +5848,7 @@ if test "$_lt_caught_CXX_error" != yes;
fi
test -z "${LDCXX+set}" || LD=$LDCXX
CC=${CXX-"c++"}
+ CFLAGS=$CXXFLAGS
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_CC_BASENAME([$compiler])
@@ -5451,8 +5870,8 @@ if test "$_lt_caught_CXX_error" != yes;
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -5484,7 +5903,7 @@ if test "$_lt_caught_CXX_error" != yes;
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
else
GXX=no
@@ -5593,10 +6012,10 @@ if test "$_lt_caught_CXX_error" != yes;
_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
# Determine the default libpath from the value encoded in an empty
# executable.
- _LT_SYS_MODULE_PATH_AIX
+ _LT_SYS_MODULE_PATH_AIX([$1])
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
@@ -5605,14 +6024,19 @@ if test "$_lt_caught_CXX_error" != yes;
else
# Determine the default libpath from the value encoded in an
# empty executable.
- _LT_SYS_MODULE_PATH_AIX
+ _LT_SYS_MODULE_PATH_AIX([$1])
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- # Exported symbols can be pulled into shared objects from archives
- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ if test "$with_gnu_ld" = yes; then
+ # We only use this code for GNU lds that support --whole-archive.
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ else
+ # Exported symbols can be pulled into shared objects from archives
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ fi
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds its shared
# libraries.
@@ -5642,28 +6066,75 @@ if test "$_lt_caught_CXX_error" != yes;
;;
cygwin* | mingw* | pw32* | cegcc*)
- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
- # as there is no search path for DLLs.
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(always_export_symbols, $1)=no
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
+ case $GXX,$cc_basename in
+ ,cl* | no,cl*)
+ # Native MSVC
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_TAGVAR(always_export_symbols, $1)=yes
+ _LT_TAGVAR(file_list_spec, $1)='@'
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+ else
+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+ fi~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
+ # The linker will not automatically build a static lib if we build a DLL.
+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ # Don't use ranlib
+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile="$lt_outputfile.exe"
+ lt_tool_outputfile="$lt_tool_outputfile.exe"
+ ;;
+ esac~
+ func_to_tool_file "$lt_outputfile"~
+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
+ ;;
+ *)
+ # g++
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_TAGVAR(always_export_symbols, $1)=no
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file (1st line
+ # is EXPORTS), use it as is; otherwise, prepend...
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+ esac
+ ;;
darwin* | rhapsody*)
_LT_DARWIN_LINKER_FEATURES($1)
;;
@@ -5705,6 +6176,11 @@ if test "$_lt_caught_CXX_error" != yes;
gnu*)
;;
+ haiku*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
hpux9*)
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -5729,11 +6205,11 @@ if test "$_lt_caught_CXX_error" != yes;
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
if test "$GXX" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
else
# FIXME: insert proper C++ library support
_LT_TAGVAR(ld_shlibs, $1)=no
@@ -5794,7 +6270,7 @@ if test "$_lt_caught_CXX_error" != yes;
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
if test "$GXX" = yes; then
@@ -5804,10 +6280,10 @@ if test "$_lt_caught_CXX_error" != yes;
_LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
esac
fi
@@ -5837,7 +6313,7 @@ if test "$_lt_caught_CXX_error" != yes;
case $cc_basename in
CC*)
# SGI C++
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
@@ -5848,9 +6324,9 @@ if test "$_lt_caught_CXX_error" != yes;
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
fi
fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -5879,7 +6355,7 @@ if test "$_lt_caught_CXX_error" != yes;
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -5916,26 +6392,26 @@ if test "$_lt_caught_CXX_error" != yes;
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
- *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
+ *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
_LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
rm -rf $tpldir~
$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
_LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
rm -rf $tpldir~
$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
$RANLIB $oldlib'
_LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
rm -rf $tpldir~
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
rm -rf $tpldir~
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
;;
- *) # Version 6 will use weak symbols
+ *) # Version 6 and above use weak symbols
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
;;
@@ -5943,7 +6419,7 @@ if test "$_lt_caught_CXX_error" != yes;
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
;;
cxx*)
# Compaq C++
@@ -5962,9 +6438,9 @@ if test "$_lt_caught_CXX_error" != yes;
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
;;
- xl*)
+ xl* | mpixl* | bgxl*)
# IBM XL 8.0 on PPC, with GNU ld
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -5984,13 +6460,13 @@ if test "$_lt_caught_CXX_error" != yes;
_LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
# Not sure whether something based on
# $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
# would be better.
- output_verbose_link_cmd='echo'
+ output_verbose_link_cmd='func_echo_all'
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -6059,7 +6535,7 @@ if test "$_lt_caught_CXX_error" != yes;
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
_LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
fi
- output_verbose_link_cmd=echo
+ output_verbose_link_cmd=func_echo_all
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -6094,15 +6570,15 @@ if test "$_lt_caught_CXX_error" != yes;
case $host in
osf3*)
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
;;
*)
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
$RM $lib.exp'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
;;
@@ -6118,17 +6594,17 @@ if test "$_lt_caught_CXX_error" != yes;
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
case $host in
osf3*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
;;
esac
@@ -6138,7 +6614,7 @@ if test "$_lt_caught_CXX_error" != yes;
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
else
# FIXME: insert proper C++ library support
@@ -6174,7 +6650,7 @@ if test "$_lt_caught_CXX_error" != yes;
solaris*)
case $cc_basename in
- CC*)
+ CC* | sunCC*)
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(archive_cmds_need_lc,$1)=yes
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -6195,7 +6671,7 @@ if test "$_lt_caught_CXX_error" != yes;
esac
_LT_TAGVAR(link_all_deplibs, $1)=yes
- output_verbose_link_cmd='echo'
+ output_verbose_link_cmd='func_echo_all'
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -6215,14 +6691,14 @@ if test "$_lt_caught_CXX_error" != yes;
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
if $CC --version | $GREP -v '^2\.7' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -6233,7 +6709,7 @@ if test "$_lt_caught_CXX_error" != yes;
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
fi
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
@@ -6287,6 +6763,10 @@ if test "$_lt_caught_CXX_error" != yes;
CC*)
_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+ '"$_LT_TAGVAR(old_archive_cmds, $1)"
+ _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+ '"$_LT_TAGVAR(reload_cmds, $1)"
;;
*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -6342,6 +6822,7 @@ if test "$_lt_caught_CXX_error" != yes;
fi # test -n "$compiler"
CC=$lt_save_CC
+ CFLAGS=$lt_save_CFLAGS
LDCXX=$LD
LD=$lt_save_LD
GCC=$lt_save_GCC
@@ -6356,6 +6837,29 @@ AC_LANG_POP
])# _LT_LANG_CXX_CONFIG
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+#
+# This function is identical to the (non-XSI) version of func_stripname,
+# except this one can be used by m4 code that may be executed by configure,
+# rather than the libtool script.
+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
+AC_REQUIRE([_LT_DECL_SED])
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
+func_stripname_cnf ()
+{
+ case ${2} in
+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+ esac
+} # func_stripname_cnf
+])# _LT_FUNC_STRIPNAME_CNF
+
# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
# ---------------------------------
# Figure out "hidden" library dependencies from verbose
@@ -6364,6 +6868,7 @@ AC_LANG_POP
# objects, libraries and library flags.
m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
# Dependencies to place before and after the object being linked:
_LT_TAGVAR(predep_objects, $1)=
_LT_TAGVAR(postdep_objects, $1)=
@@ -6414,6 +6919,13 @@ public class foo {
};
_LT_EOF
])
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+esac
+
dnl Parse the compiler output and extract the necessary
dnl objects, libraries and library flags.
if AC_TRY_EVAL(ac_compile); then
@@ -6425,7 +6937,7 @@ if AC_TRY_EVAL(ac_compile); then
pre_test_object_deps_done=no
for p in `eval "$output_verbose_link_cmd"`; do
- case $p in
+ case ${prev}${p} in
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
@@ -6434,13 +6946,22 @@ if AC_TRY_EVAL(ac_compile); then
test $p = "-R"; then
prev=$p
continue
- else
- prev=
fi
+ # Expand the sysroot to ease extracting the directories later.
+ if test -z "$prev"; then
+ case $p in
+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+ esac
+ fi
+ case $p in
+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+ esac
if test "$pre_test_object_deps_done" = no; then
- case $p in
- -L* | -R*)
+ case ${prev} in
+ -L | -R)
# Internal compiler library paths should come after those
# provided the user. The postdeps already come after the
# user supplied libs so there is no need to process them.
@@ -6460,8 +6981,10 @@ if AC_TRY_EVAL(ac_compile); then
_LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
fi
fi
+ prev=
;;
+ *.lto.$objext) ;; # Ignore GCC LTO objects
*.$objext)
# This assumes that the test object file only shows up
# once in the compiler output.
@@ -6497,6 +7020,7 @@ else
fi
$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
# PORTME: override above test on systems where it is broken
m4_if([$1], [CXX],
@@ -6533,7 +7057,7 @@ linux*)
solaris*)
case $cc_basename in
- CC*)
+ CC* | sunCC*)
# The more standards-conforming stlport4 library is
# incompatible with the Cstd library. Avoid specifying
# it if it's in CXXFLAGS. Ignore libCrun as
@@ -6577,32 +7101,16 @@ _LT_TAGDECL([], [compiler_lib_search_pat
])# _LT_SYS_HIDDEN_LIBDEPS
-# _LT_PROG_F77
-# ------------
-# Since AC_PROG_F77 is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_F77],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
-AC_PROG_F77
-if test -z "$F77" || test "X$F77" = "Xno"; then
- _lt_disable_F77=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_F77
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_F77], [])
-
-
# _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_REQUIRE([_LT_PROG_F77])dnl
-AC_LANG_PUSH(Fortran 77)
+[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)=
@@ -6621,6 +7129,8 @@ _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
@@ -6660,7 +7170,9 @@ if test "$_lt_disable_F77" != yes; then
# 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])
@@ -6714,38 +7226,24 @@ if test "$_lt_disable_F77" != yes; then
GCC=$lt_save_GCC
CC="$lt_save_CC"
+ CFLAGS="$lt_save_CFLAGS"
fi # test "$_lt_disable_F77" != yes
AC_LANG_POP
])# _LT_LANG_F77_CONFIG
-# _LT_PROG_FC
-# -----------
-# Since AC_PROG_FC is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_FC],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
-AC_PROG_FC
-if test -z "$FC" || test "X$FC" = "Xno"; then
- _lt_disable_FC=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_FC
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_FC], [])
-
-
# _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_REQUIRE([_LT_PROG_FC])dnl
-AC_LANG_PUSH(Fortran)
+[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
_LT_TAGVAR(allow_undefined_flag, $1)=
@@ -6764,6 +7262,8 @@ _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
@@ -6803,7 +7303,9 @@ if test "$_lt_disable_FC" != yes; then
# 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
@@ -6859,7 +7361,8 @@ if test "$_lt_disable_FC" != yes; then
fi # test -n "$compiler"
GCC=$lt_save_GCC
- CC="$lt_save_CC"
+ CC=$lt_save_CC
+ CFLAGS=$lt_save_CFLAGS
fi # test "$_lt_disable_FC" != yes
AC_LANG_POP
@@ -6896,10 +7399,12 @@ _LT_COMPILER_BOILERPLATE
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
lt_save_GCC=$GCC
GCC=yes
CC=${GCJ-"gcj"}
+CFLAGS=$GCJFLAGS
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_TAGVAR(LD, $1)="$LD"
@@ -6909,6 +7414,8 @@ _LT_CC_BASENAME([$compiler])
_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
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
@@ -6928,7 +7435,8 @@ fi
AC_LANG_RESTORE
GCC=$lt_save_GCC
-CC="$lt_save_CC"
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
])# _LT_LANG_GCJ_CONFIG
@@ -6963,9 +7471,11 @@ _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])
@@ -6978,7 +7488,8 @@ fi
GCC=$lt_save_GCC
AC_LANG_RESTORE
-CC="$lt_save_CC"
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
])# _LT_LANG_RC_CONFIG
@@ -7037,6 +7548,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object
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_DECL_SED
# ------------
@@ -7130,8 +7650,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
# Try some XSI features
xsi_shell=no
( _lt_dummy="a/b/c"
- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
- = c,a/b,, \
+ 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
@@ -7170,208 +7690,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn
])# _LT_CHECK_SHELL_FEATURES
-# _LT_PROG_XSI_SHELLFNS
-# ---------------------
-# Bourne and XSI compatible variants of some useful shell functions.
-m4_defun([_LT_PROG_XSI_SHELLFNS],
-[case $xsi_shell in
- yes)
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
-}
-
-# func_basename file
-func_basename ()
-{
- func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-# dirname: Compute the dirname of FILE. If nonempty,
-# add APPEND to the result, otherwise set result
-# to NONDIR_REPLACEMENT.
-# value returned in "$func_dirname_result"
-# basename: Compute filename of FILE.
-# value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
- func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
- # positional parameters, so assign one to ordinary parameter first.
- func_stripname_result=${3}
- func_stripname_result=${func_stripname_result#"${1}"}
- func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
- func_opt_split_opt=${1%%=*}
- func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
- case ${1} in
- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- *) func_lo2o_result=${1} ;;
- esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=${1%.*}.lo
-}
+# _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=:
+])
-# func_arith arithmetic-term...
-func_arith ()
-{
- func_arith_result=$(( $[*] ))
-}
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=${#1}
-}
+# _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_EOF
- ;;
- *) # Bourne compatible functions.
- cat << \_LT_EOF >> "$cfgfile"
+ _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}"}])
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
- # Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
-}
+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
+ func_split_long_opt_name=${1%%=*}
+ func_split_long_opt_arg=${1#*=}])
-# func_basename file
-func_basename ()
-{
- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
+ _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"}])
-dnl func_dirname_and_basename
-dnl A portable version of this function is already defined in general.m4sh
-dnl so there is no need for it here.
+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
+ case ${1} in
+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+ *) func_lo2o_result=${1} ;;
+ esac])
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
- case ${2} in
- .*) func_stripname_result=`$ECHO "X${3}" \
- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "X${3}" \
- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
- esac
-}
+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
-# sed scripts:
-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[[^=]]*=//'
+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
-# func_opt_split
-func_opt_split ()
-{
- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
+fi
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
-}
+if test x"$lt_shell_append" = xyes; then
+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
-# func_arith arithmetic-term...
-func_arith ()
-{
- func_arith_result=`expr "$[@]"`
-}
+ _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"])
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
+ # 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_EOF
-esac
+if test x"$_lt_function_replace_fail" = x":"; then
+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
+fi
+])
-case $lt_shell_append in
- yes)
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
- eval "$[1]+=\$[2]"
-}
-_LT_EOF
+# _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
;;
- *)
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
- eval "$[1]=\$$[1]\$[2]"
-}
-
-_LT_EOF
+ *-*-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
;;
- esac
+ * ) # unhandled hosts (and "normal" native builds)
+ lt_cv_to_host_file_cmd=func_convert_file_noop
+ ;;
+esac
+])
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
+ [0], [convert $build file names to $host format])dnl
+
+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+[#assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+ *-*-mingw* )
+ case $build in
+ *-*-mingw* ) # actually msys
+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+ ;;
+ esac
+ ;;
+esac
])
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+ [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS
diff -pruN 3.0.0-2/m4/lt~obsolete.m4 3.0.1-0ubuntu1/m4/lt~obsolete.m4
--- 3.0.0-2/m4/lt~obsolete.m4 2011-04-04 08:31:25.000000000 +0000
+++ 3.0.1-0ubuntu1/m4/lt~obsolete.m4 2012-01-03 09:26:44.000000000 +0000
@@ -1,13 +1,13 @@
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
#
-# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+# 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 4 lt~obsolete.m4
+# serial 5 lt~obsolete.m4
# These exist entirely to fool aclocal when bootstrapping libtool.
#
@@ -77,7 +77,6 @@ m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC
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_RC], [AC_DEFUN([AC_LIBTOOL_RC])])
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])])
@@ -90,3 +89,10 @@ m4_ifndef([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])])
diff -pruN 3.0.0-2/m4/ltoptions.m4 3.0.1-0ubuntu1/m4/ltoptions.m4
--- 3.0.0-2/m4/ltoptions.m4 2011-04-04 08:31:25.000000000 +0000
+++ 3.0.1-0ubuntu1/m4/ltoptions.m4 2012-01-03 09:26:43.000000000 +0000
@@ -1,13 +1,14 @@
# Helper functions for option handling. -*- Autoconf -*-
#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# 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.
-# serial 6 ltoptions.m4
+# serial 7 ltoptions.m4
# This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -125,7 +126,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],
[enable_win32_dll=yes
case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
AC_CHECK_TOOL(AS, as, false)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
AC_CHECK_TOOL(OBJDUMP, objdump, false)
@@ -133,13 +134,13 @@ case $host in
esac
test -z "$AS" && AS=as
-_LT_DECL([], [AS], [0], [Assembler program])dnl
+_LT_DECL([], [AS], [1], [Assembler program])dnl
test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
])# win32-dll
AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
diff -pruN 3.0.0-2/m4/ltversion.m4 3.0.1-0ubuntu1/m4/ltversion.m4
--- 3.0.0-2/m4/ltversion.m4 2011-04-04 08:31:25.000000000 +0000
+++ 3.0.1-0ubuntu1/m4/ltversion.m4 2012-01-03 09:26:43.000000000 +0000
@@ -7,17 +7,17 @@
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
-# Generated from ltversion.in.
+# @configure_input@
-# serial 3017 ltversion.m4
+# serial 3293 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-m4_define([LT_PACKAGE_REVISION], [1.3017])
+m4_define([LT_PACKAGE_VERSION], [2.4])
+m4_define([LT_PACKAGE_REVISION], [1.3293])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6b'
-macro_revision='1.3017'
+[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)
])
diff -pruN 3.0.0-2/Makefile.in 3.0.1-0ubuntu1/Makefile.in
--- 3.0.0-2/Makefile.in 2011-04-04 08:31:35.000000000 +0000
+++ 3.0.1-0ubuntu1/Makefile.in 2012-01-03 09:26:48.000000000 +0000
@@ -133,6 +133,7 @@ DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
+DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -170,6 +171,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
@@ -212,6 +214,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -245,7 +248,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff -pruN 3.0.0-2/NEWS 3.0.1-0ubuntu1/NEWS
--- 3.0.0-2/NEWS 2011-04-04 08:31:06.000000000 +0000
+++ 3.0.1-0ubuntu1/NEWS 2012-01-03 09:26:02.000000000 +0000
@@ -1,3 +1,34 @@
+gnome-nettool 3.0.1, 2012-01-03
+-------------------------------
+
+- Fix OpenBSD compilation (Jasper Lievisse Adriaanse)
+- Fix netstat routing table display on OpenBSD (Antoine Jacoutot)
+- Use finger by default instead of pinky (Ayan George)
+- Fix up to make translations work (Kjartan Maraas)
+- Fix ugliness when window is bigger than expected (Jean Schurger)
+- Handle output with icmp_req (Josselin Mouette)
+- Portability fixes for IPv4/IPv6 (Jasper Lievisse Adriaanse)
+- Fix memory leak (Germán Poo-Caamaño)
+- Fixed garbage in translated string for loopback (Germán Poo-Caamaño)
+- Fix ping layout to resize it gently (Germán Poo-Caamaño)
+
+- Updated translations
+ - as (Nilamdyuti Goswami)
+ - ast (Xandru Armesto)
+ - ca (Carles Ferrando)
+ - el (George Stefanakis)
+ - fi (Tommi Vainikainen)
+ - ja (Jiro Matsuzawa)
+ - lt (Aurimas Ä?ernius)
+ - sk (Tomáš Virgl)
+ - ta (Dr.T.Vasudevan)
+ - te (krishnababu k)
+ - tr (Muhammet Kara)
+
+- New translations
+ - be (Yuri Matsuk)
+ - eo (Kristjan SCHMIDT)
+
gnome-nettool 3.0.0, 2011-04-04
-------------------------------
diff -pruN 3.0.0-2/.pc/01_ping_icmp_req.patch/src/ping.c 3.0.1-0ubuntu1/.pc/01_ping_icmp_req.patch/src/ping.c
--- 3.0.0-2/.pc/01_ping_icmp_req.patch/src/ping.c 2011-01-11 10:32:42.000000000 +0000
+++ 3.0.1-0ubuntu1/.pc/01_ping_icmp_req.patch/src/ping.c 1970-01-01 00:00:00.000000000 +0000
@@ -1,662 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8 -*- */
-
-/* gnome-netinfo - A GUI Interface for network utilities
- * Copyright (C) 2002, 2003 by German Poo-Caaman~o
- *
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <glib/gprintf.h>
-#include <sys/types.h>
-#include <signal.h>
-#include <errno.h>
-
-#include "ping.h"
-#include "utils.h"
-
-enum {
- BYTES_COLUMN = 0,
- IP_COLUMN,
- ICMP_SEQ_COLUMN,
- SRTT_COLUMN,
- UNIT_COLUMN,
-};
-
-static gint strip_line (gchar * line, ping_data * data, Netinfo * netinfo);
-static gint strip_total_line (gchar * line, gint * packet_total);
-static GtkTreeModel *ping_create_model (GtkTreeView * widget);
-
-static gfloat rttmin, rttmax, rttavg;
-static gint packets_transmitted;
-static gint packets_received;
-static gint packets_success;
-
-typedef struct {
- gdouble value;
- gboolean valid;
-} PingGraphBarData;
-
-static void
-draw_centered_text (GtkWidget *widget, cairo_t *cr, gint x, gint y, gchar *text)
-{
- int width;
- PangoLayout *layout;
-
- layout = gtk_widget_create_pango_layout (widget, text);
-
- pango_layout_get_pixel_size (layout, &width, NULL);
-
- x -= width/2;
-
- gtk_paint_layout (gtk_widget_get_style(widget), cr,
- GTK_STATE_NORMAL, TRUE,
- widget, NULL, x, y,
- layout);
- g_object_unref (layout);
-}
-
-static gdouble
-get_bar_data (Netinfo *netinfo, PingGraphBarData *bar_data, int ntodisplay,
- gint rangemin, gint rangemax)
-{
- gint i, index;
- GtkTreeModel *results;
- GtkTreeIter node;
- gboolean nodeavailable;
- gint seqnumber;
- gchar *srtt_str;
- gdouble max;
-
- for (i = 0; i<ntodisplay; i++) {
- bar_data[i].value = 0;
- bar_data[i].valid = FALSE;
- }
-
- results = gtk_tree_view_get_model (GTK_TREE_VIEW (netinfo->output));
-
- if (results != NULL) {
- nodeavailable = gtk_tree_model_get_iter_first (results, &node);
- while (nodeavailable) {
- gtk_tree_model_get (results, &node,
- ICMP_SEQ_COLUMN, &seqnumber, -1);
- index = seqnumber - rangemin - 1;
- if (seqnumber > rangemin) {
- gtk_tree_model_get (results, &node,
- SRTT_COLUMN, &srtt_str,
- -1);
- bar_data[index].value = g_strtod (srtt_str,
- NULL);
- g_free (srtt_str);
- bar_data[index].valid = TRUE;
- }
- nodeavailable = gtk_tree_model_iter_next (results, &node);
- }
-
- }
-
- max = 0.0;
- for (i = 0; i<ntodisplay; i++)
- if (bar_data[i].valid && (bar_data[i].value > max))
- max = bar_data[i].value;
-
- return max;
-}
-
-static void
-draw_ping_graph (Netinfo *netinfo)
-{
- cairo_t *cr;
- GtkStyle *style;
- GtkWidget *widget;
- PangoLayout *layout;
- gint ntodisplay = 5;
- gint rangemin, rangemax;
- PingGraphBarData *bar_data;
- gdouble max;
- gint width, height;
- gint font_height, offset;
- gint bar_height, separator_height;
- gdouble scale_factor;
- gint line1h, line2h;
- gint index;
- gint step, x, h;
- gchar *tmpstr;
-
- widget = netinfo->graph;
- cr = gdk_cairo_create (gtk_widget_get_window(widget));
- style = gtk_widget_get_style(widget);
-
- rangemax = packets_transmitted;
- rangemin = MAX (0, rangemax - ntodisplay);
-
- bar_data = g_newa (PingGraphBarData, ntodisplay);
- max = get_bar_data (netinfo, bar_data, ntodisplay, rangemin,
- rangemax);
-
- /* Created up here so we can get the geometry info. */
- layout = gtk_widget_create_pango_layout (widget, _("Time (ms):"));
- /* We guess that the first label is representative. */
- pango_layout_get_pixel_size (layout, NULL, &font_height);
- width = gtk_widget_get_allocated_width (widget);
- height = gtk_widget_get_allocated_height (widget);
-
- offset = 0.05*height;
- bar_height = height - 2.5*font_height - offset;
- scale_factor = bar_height / max;
- separator_height = bar_height + offset;
- line1h = bar_height + 0.125*font_height + offset;
- line2h = bar_height + 1.25*font_height + offset;
-
- gtk_paint_box (style, cr, GTK_STATE_NORMAL, GTK_SHADOW_ETCHED_IN,
- widget, NULL, 0, 0, width, height);
-
- gtk_paint_layout (style, cr, GTK_STATE_NORMAL, TRUE,
- widget, NULL, 0.02*width, line1h,
- layout);
- g_object_unref (layout);
-
- layout = gtk_widget_create_pango_layout (widget, _("Seq. No.:"));
- gtk_paint_layout (style, cr, GTK_STATE_NORMAL, TRUE,
- widget, NULL, 0.02*width, line2h,
- layout);
- g_object_unref (layout);
-
- gtk_paint_hline (style, cr, GTK_STATE_NORMAL, widget, NULL,
- 0.02*width, 0.98*width, separator_height);
-
- index = 0;
- step = width / (ntodisplay + 1.0);
- for (x = 1.5*step; x < width; x += step) {
- if (bar_data[index].valid) {
- h = scale_factor*bar_data[index].value;
- gtk_paint_flat_box (style, cr, GTK_STATE_SELECTED,
- GTK_SHADOW_ETCHED_IN, widget,
- NULL, x - 0.4*step,
- offset + bar_height - h,
- 0.8*step, h);
- tmpstr = g_strdup_printf ("%.2f", bar_data[index].value);
- } else {
- tmpstr = g_strdup ("-");
- }
- draw_centered_text (widget, cr, x, line1h, tmpstr);
- g_free (tmpstr);
- if (index + rangemin + 1 <= rangemax) {
- tmpstr = g_strdup_printf ("%d", index + rangemin + 1);
- } else {
- tmpstr = g_strdup ("-");
- }
- draw_centered_text (widget, cr, x, line2h, tmpstr);
- g_free (tmpstr);
- index++;
- }
-
- cairo_destroy (cr);
-}
-
-gint
-on_ping_graph_draw (GtkWidget *widget, cairo_t *cr,
- Netinfo *info)
-{
- draw_ping_graph (info);
-
- return TRUE;
-}
-
-void
-ping_stop (Netinfo * netinfo)
-{
- g_return_if_fail (netinfo != NULL);
-
- netinfo_stop_process_command (netinfo);
-}
-
-void
-ping_do (Netinfo * netinfo)
-{
- gint count;
- const gchar *host = NULL;
- gchar *command = NULL;
- GtkTreeModel *model;
- GtkLabel *min, *avg, *max, *pkt_transmitted, *pkt_received,
- *pkt_success;
- gchar stmp[128];
- gchar *program = NULL;
- gchar *count_string = NULL;
- GtkWidget *parent;
- gint ip_version;
-
- g_return_if_fail (netinfo != NULL);
-
- /* Because of the delay, we can't check twice for a hostname/IP.
- * It was made before this function was called. Anyway, we
- * check at least if we have a text as hostname */
- if (netinfo_validate_domain (netinfo) == FALSE) {
- netinfo_stop_process_command (netinfo);
- return;
- }
-
- count = netinfo_get_count (netinfo);
- host = netinfo_get_host (netinfo);
-
- if (netinfo->stbar_text)
- g_free (netinfo->stbar_text);
- netinfo->stbar_text = g_strdup_printf (_("Sending ping requests to %s"), host);
-
- rttmin = rttavg = rttmax = 0.0;
- packets_transmitted = packets_received = packets_success = 0;
-
- /* Clear the statistics before starting a ping */
-
- min = GTK_LABEL (netinfo->min);
- avg = GTK_LABEL (netinfo->avg);
- max = GTK_LABEL (netinfo->max);
- gtk_label_set_text (min,
- g_ascii_formatd (stmp, 128, "%0.2f", rttmin));
- gtk_label_set_text (avg,
- g_ascii_formatd (stmp, 128, "%0.2f", rttavg));
- gtk_label_set_text (max,
- g_ascii_formatd (stmp, 128, "%0.2f", rttmax));
-
- pkt_transmitted = GTK_LABEL (netinfo->packets_transmitted);
- pkt_received = GTK_LABEL (netinfo->packets_received);
- pkt_success = GTK_LABEL (netinfo->packets_success);
- g_sprintf (stmp, "%d", packets_transmitted);
- gtk_label_set_text (pkt_transmitted, stmp);
- g_sprintf (stmp, "%d", packets_received);
- gtk_label_set_text (pkt_received, stmp);
- g_sprintf (stmp, "%d%%", packets_success);
- gtk_label_set_text (pkt_success, stmp);
-
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (netinfo->output));
- if (GTK_IS_LIST_STORE (model)) {
- gtk_list_store_clear (GTK_LIST_STORE (model));
- }
-
- draw_ping_graph (netinfo);
-
- parent = gtk_widget_get_toplevel (netinfo->output);
-
- ip_version = netinfo_get_ip_version (netinfo);
- switch (ip_version)
- {
- case IPV4:
- program = util_find_program_dialog ("ping", parent);
- break;
- case IPV6:
- program = util_find_program_dialog ("ping6", parent);
-
- break;
- case -1:
- default:
- /*invalid host or ip address*/
- return;
- }
-
- if (program != NULL) {
- /* unlimited or limited ping? */
- if (count == -1) {
- count_string = g_strdup_printf(" ");
- } else {
-#if defined(__sun__) || defined(__hpux__)
- count_string = g_strdup_printf("%d", count);
-#else
- count_string = g_strdup_printf(" -c %d ", count);
-#endif
- }
-
- if (ip_version == IPV4) {
- command =
-#if defined(__sun__) || defined(__hpux__)
- g_strdup_printf (PING_PROGRAM_FORMAT, program,
- host, count_string);
-#else
- g_strdup_printf (PING_PROGRAM_FORMAT, program,
- count_string, host);
-#endif
- } else {
- command =
-#if defined(__sun__) || defined(__hpux__)
- g_strdup_printf (PING_PROGRAM_FORMAT_6, program,
- host, count_string);
-#else
- g_strdup_printf (PING_PROGRAM_FORMAT_6, program,
- count_string, host);
-#endif
- }
- g_print("command: %s\n", command);
-
- netinfo->command_line = g_strsplit (command, " ", -1);
-
- netinfo_process_command (netinfo);
-
- g_strfreev (netinfo->command_line);
- }
-
- g_free (count_string);
- g_free (command);
- g_free (program);
-}
-
-/* Process each line from ping command */
-void
-ping_foreach (Netinfo * netinfo, gchar * line, gssize len,
- gpointer user_data)
-{
- gchar *text_utf8;
- gsize bytes_written;
- GtkTextBuffer *buffer = NULL;
- GtkTextIter iter;
-
- g_return_if_fail (netinfo != NULL);
- g_return_if_fail (line != NULL);
-
- buffer =
- gtk_text_view_get_buffer (GTK_TEXT_VIEW (netinfo->output));
- gtk_text_buffer_get_end_iter (buffer, &iter);
-
- if (len > 0) {
- text_utf8 = g_locale_to_utf8 (line, len,
- NULL, &bytes_written, NULL);
-
- gtk_text_buffer_insert
- (GTK_TEXT_BUFFER (buffer), &iter, text_utf8,
- bytes_written);
- g_free (text_utf8);
- }
-}
-
-void
-ping_foreach_with_tree (Netinfo * netinfo, gchar * line, gint len,
- gpointer user_data)
-{
- GtkTreeIter iter;
- GList *columns;
- GtkTreePath *path;
- GtkTreeModel *model;
- GtkTreeView *widget;
- gint count;
- ping_data data;
- gdouble rtt;
- GtkLabel *min, *avg, *max, *pkt_transmitted, *pkt_received,
- *pkt_success;
- gchar stmp[128];
-
- g_return_if_fail (netinfo != NULL);
- g_return_if_fail (line != NULL);
-
- widget = (GTK_TREE_VIEW (netinfo->output));
- min = GTK_LABEL (netinfo->min);
- avg = GTK_LABEL (netinfo->avg);
- max = GTK_LABEL (netinfo->max);
- pkt_transmitted = GTK_LABEL (netinfo->packets_transmitted);
- pkt_received = GTK_LABEL (netinfo->packets_received);
- pkt_success = GTK_LABEL (netinfo->packets_success);
-
- if (len > 0) { /* there are data to show */
- count = strip_line (line, &data, netinfo);
- if ((count == 5) || (count == 6)) {
-
- /* Creation of GtkTreeView */
- gtk_tree_view_set_rules_hint (GTK_TREE_VIEW
- (widget), TRUE);
- columns =
- gtk_tree_view_get_columns (GTK_TREE_VIEW
- (widget));
-
- if (g_list_length (columns) == 0) {
-
- model = ping_create_model (widget);
- gtk_tree_view_set_model (GTK_TREE_VIEW
- (widget), model);
- }
- g_list_free (columns);
-
- model =
- gtk_tree_view_get_model (GTK_TREE_VIEW
- (widget));
-
- gtk_tree_view_get_cursor (GTK_TREE_VIEW (widget),
- &path, NULL);
-
-#ifdef DEBUG
- g_print ("%d %s %d %d %s %s\n", data.bytes,
- data.ip, data.icmp_seq, data.ttl,
- data.srtt, data.unit);
-#endif /* DEBUG */
-
- gtk_list_store_append (GTK_LIST_STORE
- (model), &iter);
-
- gtk_list_store_set (GTK_LIST_STORE (model), &iter,
- BYTES_COLUMN, data.bytes,
- IP_COLUMN, data.ip,
- ICMP_SEQ_COLUMN, data.icmp_seq,
- SRTT_COLUMN, data.srtt,
- UNIT_COLUMN, data.unit, -1);
-
- gtk_tree_view_set_model (GTK_TREE_VIEW (widget),
- model);
-
- if (path) {
- gtk_tree_view_set_cursor (
- GTK_TREE_VIEW (widget),
- path, NULL, FALSE);
- gtk_tree_path_free (path);
- }
-
- rtt = g_ascii_strtod (data.srtt, NULL);
- rttmin = (rttmin > 0.0) ? MIN (rttmin, rtt) : rtt;
- rttmax = MAX (rttmax, rtt);
- if (data.icmp_seq == 0 || rttavg == 0.0) {
- rttavg = rtt;
- } else {
- rttavg =
- (rttavg * data.icmp_seq +
- rtt) / (data.icmp_seq + 1.0);
- }
-
- /* Beep if user selected to */
- if (netinfo->has_beep) {
- gdk_beep ();
- };
-
- /* ICMP SEQuence tarts at 0, but we need to calculate it as count */
- packets_transmitted = data.icmp_seq + 1;
- packets_received++;
-
- gtk_label_set_text (min,
- g_ascii_formatd (stmp, 128,
- "%0.2f",
- rttmin));
- gtk_label_set_text (avg,
- g_ascii_formatd (stmp, 128,
- "%0.2f",
- rttavg));
- gtk_label_set_text (max,
- g_ascii_formatd (stmp, 128,
- "%0.2f",
- rttmax));
-#ifdef DEBUG
- g_print ("min/avg/max: %0.2f/%0.2f/%0.2f", rttmin,
- rttavg, rttmax);
- g_print ("\npackets received: %d\n",
- packets_received);
-#endif /* DEBUG */
- } else if (g_strrstr (line, "packets transmitted")) {
- count =
- strip_total_line (line, &packets_transmitted);
- }
-
- if (packets_transmitted == 0) {
- packets_success = 0;
- } else {
- packets_success =
- ((float) packets_received / packets_transmitted * 100);
- }
-
- g_sprintf (stmp, "%d", packets_transmitted);
- gtk_label_set_text (pkt_transmitted, stmp);
- g_sprintf (stmp, "%d", packets_received);
- gtk_label_set_text (pkt_received, stmp);
- g_sprintf (stmp, "%d%%", packets_success);
- gtk_label_set_text (pkt_success, stmp);
- }
- draw_ping_graph (netinfo);
-}
-
-static gint
-strip_line (gchar * line, ping_data * data, Netinfo * netinfo)
-{
- gint count;
-
- if (netinfo_get_ip_version (netinfo) == IPV4)
- line = g_strdelimit (line, ":", ' ');
- else
- line = g_strdelimit (line, ",", ' ');
-
-#ifdef PING_PARAMS_5
- count = sscanf (line, PING_FORMAT,
- &(data)->bytes, data->ip, &(data)->icmp_seq,
- data->srtt, data->unit);
-#endif
-#ifdef PING_PARAMS_6
- count = sscanf (line, PING_FORMAT,
- &(data)->bytes, data->ip, &(data)->icmp_seq,
- &(data)->ttl, data->srtt, data->unit);
-#endif
- if (count != 5 && count != 6) {
- }
-
- return count;
-}
-
-static gint
-strip_total_line (gchar * line, gint * packet_total)
-{
- gint count;
- gint packets_received;
- gchar stmp[128];
-
- count =
- sscanf (line, PING_TOTAL, packet_total, &packets_received,
- stmp);
-
- return count;
-}
-
-static GtkTreeModel *
-ping_create_model (GtkTreeView * widget)
-{
- GtkCellRenderer *renderer;
- static GtkTreeViewColumn *column;
- GtkTreeModel *model;
-
- renderer = gtk_cell_renderer_text_new ();
- /* Number of bytes received in a ping reply */
- column =
- gtk_tree_view_column_new_with_attributes
- (_("Bytes"), renderer, "text", 0, NULL);
- gtk_tree_view_append_column (widget, column);
-
- renderer = gtk_cell_renderer_text_new ();
- /* IP address that reply a ping */
- column =
- gtk_tree_view_column_new_with_attributes
- (_("Source"), renderer, "text", 1, NULL);
- gtk_tree_view_column_set_alignment (column, 0.5);
- gtk_tree_view_append_column (widget, column);
-
- renderer = gtk_cell_renderer_text_new ();
- /* Number of sequence of a ICMP request (ping) */
- column =
- gtk_tree_view_column_new_with_attributes
- (_("Seq"), renderer, "text", 2, NULL);
- g_object_set (G_OBJECT (renderer), "xalign", 1.0, NULL);
- gtk_tree_view_append_column (widget, column);
-
-
- renderer = gtk_cell_renderer_text_new ();
- /* Time elapsed between a packets was sent and
- when was received its reply */
- column =
- gtk_tree_view_column_new_with_attributes
- (_("Time"), renderer, "text", 3, NULL);
- g_object_set (G_OBJECT (renderer), "xalign", 1.0, NULL);
- gtk_tree_view_append_column (widget, column);
-
- renderer = gtk_cell_renderer_text_new ();
- /* Unit of time elapsed (commonly will be ms) */
- column =
- gtk_tree_view_column_new_with_attributes
- (_("Units"), renderer, "text", 4, NULL);
- gtk_tree_view_append_column (widget, column);
-
- model = GTK_TREE_MODEL (gtk_list_store_new
- (5,
- G_TYPE_INT,
- G_TYPE_STRING,
- G_TYPE_INT,
- G_TYPE_STRING, G_TYPE_STRING));
- return model;
-}
-
-/* Copy on clipboard */
-void
-ping_copy_to_clipboard (Netinfo * netinfo, gpointer user_data)
-{
- GString *result, *content;
- const gchar *min, *avg, *max;
- const gchar *pkt_transmitted, *pkt_received, *pkt_success;
-
- g_return_if_fail (netinfo != NULL);
-
- /* The ping output in text format:
- Bytes received, Address Source, Number of Sequence,
- Round Trip Time (Time), Units of Time.
- It's a tabular output, and these belongs to the column titles */
- result = g_string_new (_("Bytes\tSource\tSeq\tTime\tUnits\n"));
-
- content = util_tree_model_to_string (GTK_TREE_VIEW (netinfo->output));
- g_string_append_printf (result, "%s", content->str);
-
- min = gtk_label_get_text (GTK_LABEL (netinfo->min));
- avg = gtk_label_get_text (GTK_LABEL (netinfo->avg));
- max = gtk_label_get_text (GTK_LABEL (netinfo->max));
- pkt_transmitted =
- gtk_label_get_text (GTK_LABEL (netinfo->packets_transmitted));
- pkt_received =
- gtk_label_get_text (GTK_LABEL (netinfo->packets_received));
- pkt_success = gtk_label_get_text (GTK_LABEL (netinfo->packets_success));
-
- /* The ping output in a text format (to copy on clipboard) */
- g_string_append_printf (result, _("Time minimum:\t%s ms\n"), min);
- g_string_append_printf (result, _("Time average:\t%s ms\n"), avg);
- g_string_append_printf (result, _("Time maximum:\t%s ms\n"), max);
-
- g_string_append_printf (result, _("Packets transmitted:\t%s\n"),
- pkt_transmitted);
- g_string_append_printf (result, _("Packets received:\t%s\n"),
- pkt_received);
- g_string_append_printf (result,
- _("Successful packets:\t%s\n"), pkt_success);
-
- gtk_clipboard_set_text (gtk_clipboard_get (GDK_NONE), result->str,
- result->len);
-
- g_string_free (content, TRUE);
- g_string_free (result, TRUE);
-}
diff -pruN 3.0.0-2/.pc/01_ping_icmp_req.patch/src/ping.h 3.0.1-0ubuntu1/.pc/01_ping_icmp_req.patch/src/ping.h
--- 3.0.0-2/.pc/01_ping_icmp_req.patch/src/ping.h 2011-01-11 10:32:42.000000000 +0000
+++ 3.0.1-0ubuntu1/.pc/01_ping_icmp_req.patch/src/ping.h 1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +0,0 @@
-/* gnome-netinfo - A GUI Interface for network utilities
- * Copyright (C) 2002, 2003 by German Poo-Caaman~o
- *
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <glib.h>
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "nettool.h"
-
-/* The ping usage and output is different between Unix flavours */
-#if defined(__linux__)
- /* <path to program> ping -b [-c <count>] -n <host> */
-# define PING_PROGRAM_FORMAT "%s ping -b%s-n %s"
-# define PING_PROGRAM_FORMAT_6 "%s ping6%s-n %s"
-# define PING_FORMAT "%d bytes from %s icmp_seq=%d ttl=%d time=%s %s"
-# define PING_PARAMS_6
-#elif defined(__OSF__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- /* <path to program> ping [-c <count>] -n <host> */
-# define PING_PROGRAM_FORMAT "%s ping%s-n %s"
-# define PING_PROGRAM_FORMAT_6 "%s ping6%s-n %s"
-# define PING_FORMAT "%d bytes from %s icmp_seq=%d ttl=%d time=%s %s"
-# define PING_PARAMS_6
-#elif defined(__sun__)
- /* <path to program> ping -s -n <host> [<count>] */
-# define PING_PROGRAM_FORMAT "%s ping -s -n %s 56%s"
-# define PING_PROGRAM_FORMAT_6 "%s ping -s -A inet6 -a -n %s 56%s"
-# define PING_FORMAT "%d bytes from %s icmp_seq=%d. time=%f %s"
-# define PING_PARAMS_5
-#elif defined(__hpux__)
-# define PING_PROGRAM_FORMAT "%s ping %s -n%s"
-# define PING_PROGRAM_FORMAT_6 "%s ping %s -f inet6 -n%s"
-# define PING_FORMAT "%d bytes from %s icmp_seq=%d. time=%f %s"
-# define PING_PARAMS_5
-#else
-# define PING_PROGRAM_FORMAT "%s ping %s -n %s"
-# define PING_PROGRAM_FORMAT_6 "%s ping6 %s -n %s"
-# define PING_FORMAT "%d bytes from %s icmp_seq=%d. time=%f %s"
-# define PING_PARAMS_5
-#endif
-
-#define PING_TOTAL "%d packets transmitted, %d %s"
-
-typedef struct _ping_data ping_data;
-
-struct _ping_data {
- gint bytes;
- gint icmp_seq;
- gint ttl;
- gfloat rtt;
- gchar srtt[128];
- gchar ip[128];
- gchar unit[128];
-};
-
-/* Ping funtions */
-void ping_do (Netinfo * netinfo);
-void ping_stop (Netinfo * netinfo);
-void ping_foreach (Netinfo * netinfo, gchar * line, gssize len, gpointer user_data);
-void ping_foreach_with_tree (Netinfo * netinfo, gchar * line, gint len, gpointer user_data);
-void ping_copy_to_clipboard (Netinfo * netinfo, gpointer user_data);
-gint on_ping_graph_draw (GtkWidget *widget, cairo_t *cr, Netinfo *info);
diff -pruN 3.0.0-2/.pc/02_fix_ui.patch/data/gnome-nettool.ui 3.0.1-0ubuntu1/.pc/02_fix_ui.patch/data/gnome-nettool.ui
--- 3.0.0-2/.pc/02_fix_ui.patch/data/gnome-nettool.ui 2011-01-11 10:32:42.000000000 +0000
+++ 3.0.1-0ubuntu1/.pc/02_fix_ui.patch/data/gnome-nettool.ui 2012-02-16 05:03:12.000000000 +0000
@@ -123,8 +123,8 @@
</object>
</child>
<child>
- <object class="GtkAction" id="help1">
- <property name="name">help1</property>
+ <object class="GtkAction" id="help">
+ <property name="name">help</property>
<property name="label" translatable="yes">_Help</property>
</object>
</child>
@@ -134,6 +134,7 @@
<property name="name">m_help_contents</property>
<signal handler="on_help_activate" name="activate" object="main_window"/>
</object>
+ <accelerator key="F1" modifiers=""/>
</child>
<child>
<object class="GtkAction" id="m_about">
@@ -156,8 +157,9 @@
<separator/>
<menuitem action="m_clear_history"/>
</menu>
- <menu action="help1">
+ <menu action="help">
<menuitem action="m_help_contents"/>
+ <placeholder name="LaunchpadItems"/>
<menuitem action="m_about"/>
</menu>
</menubar>
@@ -281,6 +283,7 @@
<property name="left_padding">12</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow8">
+ <property name="height_request">120</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="border_width">6</property>
@@ -289,7 +292,6 @@
<property name="shadow_type">GTK_SHADOW_IN</property>
<child>
<object class="GtkTreeView" id="info_list_ip_addr">
- <property name="height_request">120</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="rules_hint">True</property>
@@ -836,12 +838,12 @@
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <object class="GtkVBox" id="vbox18">
+ <object class="GtkVBox" id="vbox_ping_top">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">12</property>
<child>
- <object class="GtkTable" id="table6">
+ <object class="GtkTable" id="table_ping_options">
<property name="visible">True</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
@@ -898,6 +900,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
<child>
@@ -922,7 +925,7 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -976,7 +979,7 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -1000,7 +1003,7 @@
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox2">
+ <object class="GtkHButtonBox" id="hbuttonbox_ping_button">
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
@@ -1044,23 +1047,31 @@
</object>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
<packing>
<property name="position">1</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox35">
+ <object class="GtkHBox" id="hbox_ping_details">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <object class="GtkFrame" id="frame8">
+ <object class="GtkFrame" id="frame_rtt_stats">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
@@ -1234,10 +1245,11 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame9">
+ <object class="GtkFrame" id="frame_transmission_stats">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
@@ -1368,6 +1380,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -1375,23 +1388,27 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkDrawingArea" id="ping_graph">
+ <property name="height_request">160</property>
<property name="visible">True</property>
</object>
<packing>
- <property name="position">3</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
- <object class="GtkExpander" id="expander1">
+ <object class="GtkExpander" id="expander_ping">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow">
+ <property name="height_request">160</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="border_width">6</property>
@@ -1416,9 +1433,10 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="pack_type">GTK_PACK_END</property>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
@@ -1513,7 +1531,10 @@
</child>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="padding">4</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -1561,9 +1582,16 @@
</object>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -1598,6 +1626,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -1623,6 +1653,7 @@
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">12</property>
+ <property name="expand">False</property>
<child>
<object class="GtkHBox" id="hbox36">
<property name="visible">True</property>
@@ -1748,6 +1779,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -1775,6 +1808,7 @@
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">12</property>
+ <property name="expand">False</property>
<child>
<object class="GtkHBox" id="hbox37">
<property name="visible">True</property>
@@ -1905,6 +1939,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -2061,9 +2097,16 @@
</object>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -2097,6 +2140,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -2275,9 +2320,16 @@
</object>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -2312,6 +2364,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -2337,6 +2391,7 @@
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">12</property>
+ <property name="expand">False</property>
<child>
<object class="GtkHBox" id="hbox38">
<property name="visible">True</property>
@@ -2469,6 +2524,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
diff -pruN 3.0.0-2/.pc/02_lpi.patch/configure.ac 3.0.1-0ubuntu1/.pc/02_lpi.patch/configure.ac
--- 3.0.0-2/.pc/02_lpi.patch/configure.ac 1970-01-01 00:00:00.000000000 +0000
+++ 3.0.1-0ubuntu1/.pc/02_lpi.patch/configure.ac 2012-01-03 09:11:09.000000000 +0000
@@ -0,0 +1,104 @@
+AC_PREREQ([2.64])
+AC_INIT([GNOME Nettool],
+ [3.0.1],
+ [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-nettool],
+ [gnome-nettool],
+ [http://projects.gnome.org/gnome-network/]) #FIXME: website should be updated, it is even yet named gnome-network
+
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_SRCDIR([src/ping.c])
+AC_CONFIG_MACRO_DIR([m4])
+
+AM_INIT_AUTOMAKE([1.11.1 foreign])
+AM_MAINTAINER_MODE([enable])
+# Support silent build rules, requires at least automake-1.11. Disable
+# by either passing --disable-silent-rules to configure or passing V=1
+# to make
+AM_SILENT_RULES([yes])
+
+# Check for programs
+AC_PROG_CC
+
+# Initialize libtool
+LT_PREREQ([2.2])
+LT_INIT
+
+# Check headers
+AC_CHECK_HEADERS(sys/sockio.h)
+AC_CHECK_HEADERS(sys/socket.h ifaddrs.h,,AC_MSG_ERROR(Required header not found: $ac_header))
+
+dnl ******************************************
+dnl ** pkg-config dependacy checks **
+dnl ******************************************
+GIO_REQUIRED=2.25.10
+GTK_REQUIRED=2.90.4
+
+PKG_CHECK_MODULES(NETTOOL,
+ gtk+-3.0 >= $GTK_REQUIRED
+ gio-2.0 >= $GIO_REQUIRED
+ gmodule-export-2.0
+ gnome-doc-utils
+ libgtop-2.0)
+AC_SUBST(NETTOOL_CFLAGS)
+AC_SUBST(NETTOOL_LIBS)
+
+dnl
+dnl Translations
+dnl
+IT_PROG_INTLTOOL([0.40.0])
+
+GETTEXT_PACKAGE=gnome-nettool
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The gettext package])
+AM_GLIB_GNU_GETTEXT
+
+GNOME_DOC_INIT
+
+dnl
+dnl GSettings stuff
+dnl
+GLIB_GSETTINGS
+
+dnl
+dnl Debugging flags
+dnl
+GNOME_COMPILE_WARNINGS([maximum])
+CFLAGS="$CFLAGS $WARN_CFLAGS"
+
+set_debug=no
+AC_ARG_ENABLE(debug,
+[ --enable-debug Lots of noisy debug messages],
+set_debug="$enableval")
+
+AC_MSG_CHECKING(if debug messages are enabled)
+if test "$set_debug" != "no"; then
+ AC_MSG_RESULT(yes)
+ CFLAGS="-DGRD_DEBUG $CFLAGS"
+else
+ AC_MSG_RESULT(no)
+fi
+
+AC_SUBST(CFLAGS)
+AC_SUBST(CPPFLAGS)
+AC_SUBST(LDFLAGS)
+
+AC_CONFIG_FILES([
+Makefile
+data/Makefile
+data/gnome-nettool.desktop.in
+help/Makefile
+pixmaps/Makefile
+pixmaps/icons/Makefile
+pixmaps/icons/16x16/Makefile
+pixmaps/icons/16x16/apps/Makefile
+pixmaps/icons/22x22/Makefile
+pixmaps/icons/22x22/apps/Makefile
+pixmaps/icons/24x24/Makefile
+pixmaps/icons/24x24/apps/Makefile
+pixmaps/icons/32x32/Makefile
+pixmaps/icons/32x32/apps/Makefile
+pixmaps/icons/scalable/Makefile
+pixmaps/icons/scalable/apps/Makefile
+po/Makefile.in
+src/Makefile])
+AC_OUTPUT
diff -pruN 3.0.0-2/.pc/02_lpi.patch/data/gnome-nettool.ui 3.0.1-0ubuntu1/.pc/02_lpi.patch/data/gnome-nettool.ui
--- 3.0.0-2/.pc/02_lpi.patch/data/gnome-nettool.ui 1970-01-01 00:00:00.000000000 +0000
+++ 3.0.1-0ubuntu1/.pc/02_lpi.patch/data/gnome-nettool.ui 2012-01-03 09:10:16.000000000 +0000
@@ -0,0 +1,2588 @@
+<?xml version="1.0"?>
+<!--*- mode: xml -*-->
+<interface>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">99</property>
+ <property name="lower">1</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
+ <property name="value">5</property>
+ </object>
+ <object class="GtkListStore" id="model1">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Host</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model2">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Host</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model3">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Host</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model4">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Host</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model5">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Host</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model6">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">User</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model7">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Host</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkUIManager" id="uimanager1">
+ <child>
+ <object class="GtkActionGroup" id="actiongroup1">
+ <child>
+ <object class="GtkAction" id="tool1">
+ <property name="name">tool1</property>
+ <property name="label" translatable="yes">_Tool</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkToggleAction" id="m_beep">
+ <property name="name">m_beep</property>
+ <property name="label" translatable="yes">Beep on ping</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkAction" id="m_quit">
+ <property name="stock_id">gtk-quit</property>
+ <property name="name">m_quit</property>
+ <signal handler="gn_quit_app" name="activate"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkAction" id="edit1">
+ <property name="name">edit1</property>
+ <property name="label" translatable="yes">_Edit</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkAction" id="m_copy">
+ <property name="name">m_copy</property>
+ <property name="label" translatable="yes">Copy as text _report</property>
+ <signal handler="on_copy_activate" name="activate" object="notebook"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkAction" id="m_clear_history">
+ <property name="stock_id">gtk-clear</property>
+ <property name="name">m_clear_history</property>
+ <property name="label" translatable="yes">Clear _History</property>
+ <signal handler="on_clear_history_activate" name="activate" object="notebook"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkAction" id="help">
+ <property name="name">help</property>
+ <property name="label" translatable="yes">_Help</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkAction" id="m_help_contents">
+ <property name="stock_id">gtk-help</property>
+ <property name="name">m_help_contents</property>
+ <signal handler="on_help_activate" name="activate" object="main_window"/>
+ </object>
+ <accelerator key="F1" modifiers=""/>
+ </child>
+ <child>
+ <object class="GtkAction" id="m_about">
+ <property name="stock_id">gtk-about</property>
+ <property name="name">m_about</property>
+ <signal after="yes" handler="on_about_activate" name="activate" object="main_window"/>
+ </object>
+ </child>
+ </object>
+ </child>
+ <ui>
+ <menubar name="menubar1">
+ <menu action="tool1">
+ <menuitem action="m_beep"/>
+ <separator/>
+ <menuitem action="m_quit"/>
+ </menu>
+ <menu action="edit1">
+ <menuitem action="m_copy"/>
+ <separator/>
+ <menuitem action="m_clear_history"/>
+ </menu>
+ <menu action="help">
+ <menuitem action="m_help_contents"/>
+ <menuitem action="m_about"/>
+ </menu>
+ </menubar>
+ </ui>
+ </object>
+ <object class="GtkWindow" id="main_window">
+ <property name="visible">True</property>
+ <property comments="Dear Translator: This is the Window Title" name="title" translatable="yes">Devices - Network Tools</property>
+ <child>
+ <object class="GtkVBox" id="vbox_main">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkMenuBar" constructor="uimanager1" id="menubar1">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkNotebook" id="notebook">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">4</property>
+ <signal handler="on_page_switch" name="switch_page"/>
+ <child>
+ <object class="GtkVBox" id="vbox_info">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkHBox" id="hbox33">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="info_combo_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Network device:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="info_combo">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <accessibility>
+ <relation target="info_combo_label" type="labelled-by"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="info_configure_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <object class="GtkAlignment" id="alignment33">
+ <property name="visible">True</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox44">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image13">
+ <property name="visible">True</property>
+ <property name="stock">gtk-preferences</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label122">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Configure</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="info_ipv6_frame">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <child>
+ <object class="GtkAlignment" id="alignment17">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow8">
+ <property name="height_request">120</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">6</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <child>
+ <object class="GtkTreeView" id="info_list_ip_addr">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="rules_hint">True</property>
+ <property name="enable_search">False</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label96">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>IP Information</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox_info_detail">
+ <property name="visible">True</property>
+ <property name="spacing">4</property>
+ <child>
+ <object class="GtkVBox" id="vbox16">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkFrame" id="frame11">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <child>
+ <object class="GtkAlignment" id="alignment32">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkTable" id="table13">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <property name="n_rows">5</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">6</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label_hw_address">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Hardware address:</property>
+ <accessibility>
+ <relation target="info_hw_address" type="label-for"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_multicast">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Multicast:</property>
+ <accessibility>
+ <relation target="info_multicast" type="label-for"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_mtu">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">MTU:</property>
+ <accessibility>
+ <relation target="info_mtu" type="label-for"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_link_speed">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Link speed:</property>
+ <accessibility>
+ <relation target="info_link_speed" type="label-for"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_state">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">State:</property>
+ <accessibility>
+ <relation target="info_state" type="label-for"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="info_hw_address">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Not Available</property>
+ <property name="justify">GTK_JUSTIFY_RIGHT</property>
+ <property name="selectable">True</property>
+ <accessibility>
+ <relation target="label_hw_address" type="labelled-by"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="info_multicast">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Not Available</property>
+ <property name="selectable">True</property>
+ <accessibility>
+ <relation target="label_multicast" type="labelled-by"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="info_mtu">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Not Available</property>
+ <property name="selectable">True</property>
+ <accessibility>
+ <relation target="label_mtu" type="labelled-by"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="info_link_speed">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Not Available</property>
+ <property name="selectable">True</property>
+ <accessibility>
+ <relation target="label_link_speed" type="labelled-by"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="info_state">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Not Available</property>
+ <property name="selectable">True</property>
+ <accessibility>
+ <relation target="label_state" type="labelled-by"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label121">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Interface Information</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox17">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkFrame" id="frame4">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <child>
+ <object class="GtkAlignment" id="alignment16">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkTable" id="table_statitics">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <property name="n_rows">7</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">6</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label_tx_bytes">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Transmitted bytes:</property>
+ <accessibility>
+ <relation target="info_tx_bytes" type="label-for"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_rx_bytes">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Received bytes:</property>
+ <accessibility>
+ <relation target="info_rx_bytes" type="label-for"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="info_rx_bytes">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Not Available</property>
+ <property name="selectable">True</property>
+ <accessibility>
+ <relation target="label_rx_bytes" type="labelled-by"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="info_tx_bytes">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Not Available</property>
+ <property name="selectable">True</property>
+ <accessibility>
+ <relation target="label_tx_bytes" type="labelled-by"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="info_tx_errors">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Not Available</property>
+ <property name="selectable">True</property>
+ <accessibility>
+ <relation target="label_tx_errors" type="labelled-by"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_tx_errors">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Transmission errors:</property>
+ <accessibility>
+ <relation target="info_tx_errors" type="label-for"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="info_tx">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Not Available</property>
+ <property name="selectable">True</property>
+ <accessibility>
+ <relation target="label_tx" type="labelled-by"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_tx">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Transmitted packets:</property>
+ <accessibility>
+ <relation target="info_rx" type="label-for"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="info_rx">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Not Available</property>
+ <property name="selectable">True</property>
+ <accessibility>
+ <relation target="label_rx" type="labelled-by"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_rx">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Received packets:</property>
+ <accessibility>
+ <relation target="info_rx" type="label-for"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="info_rx_errors">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Not Available</property>
+ <property name="selectable">True</property>
+ <accessibility>
+ <relation target="label_rx_errors" type="labelled-by"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_rx_errors">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Reception errors:</property>
+ <accessibility>
+ <relation target="info_rx_errors" type="label-for"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="info_collisions">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Not Available</property>
+ <property name="selectable">True</property>
+ <accessibility>
+ <relation target="label_collisions" type="labelled-by"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_collisions">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Collisions:</property>
+ <property name="justify">GTK_JUSTIFY_RIGHT</property>
+ <accessibility>
+ <relation target="info_collisions" type="label-for"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label95">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Interface Statistics</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="device">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Devices</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox_ping">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkVBox" id="vbox_ping_top">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkTable" id="table_ping_options">
+ <property name="visible">True</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">6</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkHBox" id="hbox25">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkHBox" id="hbox9">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkRadioButton" id="ping_limited">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Only</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="ping_count">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="climb_rate">1</property>
+ <accessibility>
+ <relation target="ping_count_label" type="labelled-by"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="ping_count_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">requests</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="ping_unlimited">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Unlimited requests</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">ping_limited</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label109">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Send:</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="ping_host">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_entry">True</property>
+ <accessibility>
+ <relation target="ping_host_label" type="labelled-by"/>
+ </accessibility>
+ <child internal-child="entry">
+ <object class="GtkEntry" id="comboboxentry-entry1">
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Enter the network address to ping. For example: www.domain.com or 192.168.2.1</property>
+ <accessibility>
+
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="a11y-comboboxentry-entry11">
+ <property name="AtkObject::accessible_name" translatable="yes">Network address</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <property name="model">model1</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="a11y-ping_host1">
+ <property name="AtkObject::accessible_name" translatable="yes">Network address</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="ping_host_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Network address:</property>
+ <property name="use_underline">True</property>
+ <accessibility>
+ <relation target="ping_host" type="label-for"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox_ping_button">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <child>
+ <object class="GtkButton" id="ping_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <child>
+ <object class="GtkAlignment" id="alignment5">
+ <property name="visible">True</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox12">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image5">
+ <property name="visible">True</property>
+ <property name="stock">gtk-ok</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label27">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Ping</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox_ping_details">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkFrame" id="frame_rtt_stats">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <child>
+ <object class="GtkAlignment" id="alignment20">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkTable" id="table1">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">3</property>
+ <property name="column_spacing">6</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="ping_maximum">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">0.0</property>
+ <property name="selectable">True</property>
+ <accessibility>
+ <relation target="label_maximum" type="labelled-by"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="ping_average">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">0.0</property>
+ <property name="selectable">True</property>
+ <accessibility>
+ <relation target="label_average" type="labelled-by"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="ping_minimum">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">0.0</property>
+ <property name="selectable">True</property>
+ <accessibility>
+ <relation target="label_minimum" type="labelled-by"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label39">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property comments="Translators: this is the abbreviation for milliseconds" name="label" translatable="yes">ms</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label38">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">ms</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label37">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">ms</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_maximum">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Maximum:</property>
+ <accessibility>
+ <relation target="ping_maximum" type="label-for"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_average">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Average:</property>
+ <accessibility>
+ <relation target="ping_average" type="label-for"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_minimum">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Minimum:</property>
+ <accessibility>
+ <relation target="ping_minimum" type="label-for"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label99">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Round Trip Time Statistics</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame_transmission_stats">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <child>
+ <object class="GtkAlignment" id="alignment21">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkTable" id="table2">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">6</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label_packets_transmitted">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Packets transmitted:</property>
+ <accessibility>
+ <relation target="ping_packets_transmitted" type="label-for"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="ping_packets_success">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">0%</property>
+ <property name="selectable">True</property>
+ <accessibility>
+ <relation target="label_packets_success" type="labelled-by"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="ping_packets_received">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">0</property>
+ <property name="selectable">True</property>
+ <accessibility>
+ <relation target="label_packets_received" type="labelled-by"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="ping_packets_transmitted">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">0</property>
+ <property name="selectable">True</property>
+ <accessibility>
+ <relation target="label_packets_transmitted" type="labelled-by"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_packets_success">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Successful packets:</property>
+ <accessibility>
+ <relation target="ping_packets_success" type="label-for"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_packets_received">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Packets received:</property>
+ <accessibility>
+ <relation target="ping_packets_received" type="label-for"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label100">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Transmission Statistics</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkDrawingArea" id="ping_graph">
+ <property name="height_request">160</property>
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkExpander" id="expander_ping">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow">
+ <property name="height_request">160</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">6</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <child>
+ <object class="GtkTreeView" id="ping_output">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">6</property>
+ <property name="enable_search">False</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label123">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Details</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="ping">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Ping</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox_netstat">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkVBox" id="vbox19">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkHBox" id="hbox43">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label110">
+ <property name="visible">True</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">Display:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox7">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkRadioButton" id="netstat_routing">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Routing Table Information</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="netstat_protocol">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Active Network Services</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">netstat_routing</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="netstat_multicast">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Multicast Information</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">netstat_routing</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">4</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox4">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <child>
+ <object class="GtkButton" id="netstat_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <child>
+ <object class="GtkAlignment" id="alignment8">
+ <property name="visible">True</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox16">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image7">
+ <property name="visible">True</property>
+ <property name="stock">gtk-ok</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label31">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Netstat</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">6</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <child>
+ <object class="GtkTreeView" id="netstat_output">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip-text" translatable="yes">Output for net stat</property>
+ <property name="enable_search">False</property>
+ <accessibility>
+
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="a11y-netstat_output1">
+ <property name="AtkObject::accessible_name" translatable="yes">Netstat output</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="netstat">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Netstat</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox_traceroute">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkVBox" id="vbox20">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <property name="spacing">12</property>
+ <property name="expand">False</property>
+ <child>
+ <object class="GtkHBox" id="hbox36">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="traceroute_host_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Network address:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="traceroute_host">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_entry">True</property>
+ <child internal-child="entry">
+ <object class="GtkEntry" id="comboboxentry-entry2">
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Enter the network address to scan for open ports. For example: www.domain.com or 192.168.2.1</property>
+ <accessibility>
+ <relation target="traceroute_host_label" type="labelled-by"/>
+ </accessibility>
+ </object>
+ </child>
+ <property name="model">model2</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer2"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox3">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <child>
+ <object class="GtkButton" id="traceroute_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <child>
+ <object class="GtkAlignment" id="alignment7">
+ <property name="visible">True</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox15">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image6">
+ <property name="visible">True</property>
+ <property name="stock">gtk-ok</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label30">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Trace</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow3">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">6</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <child>
+ <object class="GtkTreeView" id="traceroute_output">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip-text" translatable="yes">Output for traceroute</property>
+ <property name="enable_search">False</property>
+ <accessibility>
+
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="a11y-traceroute_output1">
+ <property name="AtkObject::accessible_name" translatable="yes">Traceroute output</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="traceroute">
+ <property name="visible">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Enter the network address to trace a route to. For example: www.domain.com or 192.168.2.1</property>
+ <property name="label" translatable="yes">Traceroute</property>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox_scan">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkVBox" id="vbox21">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <property name="spacing">12</property>
+ <property name="expand">False</property>
+ <child>
+ <object class="GtkHBox" id="hbox37">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="scan_host_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Network address:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="scan_host">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_entry">True</property>
+ <child internal-child="entry">
+ <object class="GtkEntry" id="comboboxentry-entry3">
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Enter the network address to scan for open ports. For example: www.domain.com or 192.168.2.1</property>
+ <accessibility>
+
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="a11y-comboboxentry-entry31">
+ <property name="AtkObject::accessible_name" translatable="yes">Network address</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <property name="model">model3</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer3"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox5">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <child>
+ <object class="GtkButton" id="scan_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <child>
+ <object class="GtkAlignment" id="alignment9">
+ <property name="visible">True</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox18">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image8">
+ <property name="visible">True</property>
+ <property name="stock">gtk-ok</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label47">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Scan</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow4">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">6</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <child>
+ <object class="GtkTreeView" id="scan_output">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip-text" translatable="yes">Output for port scan</property>
+ <property name="enable_search">False</property>
+ <accessibility>
+
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="a11y-scan_output1">
+ <property name="AtkObject::accessible_name" translatable="yes">Port scan output</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="scan">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Port Scan</property>
+ </object>
+ <packing>
+ <property name="position">4</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox_lookup">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkVBox" id="vbox23">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkTable" id="table7">
+ <property name="visible">True</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">6</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkComboBox" id="lookup_type">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="lookup_type_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Information type:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="lookup_host">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_entry">True</property>
+ <child internal-child="entry">
+ <object class="GtkEntry" id="comboboxentry-entry4">
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Enter the network address to lookup. For example: www.domain.com or 192.168.2.1</property>
+ <accessibility>
+
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="a11y-comboboxentry-entry41">
+ <property name="AtkObject::accessible_name" translatable="yes">Network address</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <property name="model">model4</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer4"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="lookup_host_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Network address:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox6">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <child>
+ <object class="GtkButton" id="lookup_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <child>
+ <object class="GtkAlignment" id="alignment10">
+ <property name="visible">True</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox27">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image9">
+ <property name="visible">True</property>
+ <property name="stock">gtk-ok</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label68">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Lookup</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow5">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">6</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <child>
+ <object class="GtkTreeView" id="lookup_output">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip-text" translatable="yes">Output for lookup</property>
+ <accessibility>
+
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="a11y-lookup_output1">
+ <property name="AtkObject::accessible_name" translatable="yes">Lookup output</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="lookup">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Lookup</property>
+ </object>
+ <packing>
+ <property name="position">5</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox_finger">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkVBox" id="vbox24">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkTable" id="table8">
+ <property name="visible">True</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">6</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkComboBox" id="finger_host">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_entry">True</property>
+ <child internal-child="entry">
+ <object class="GtkEntry" id="comboboxentry-entry6">
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Enter the network address to finger that user. For example: www.domain.com or 192.168.2.1</property>
+ <accessibility>
+
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="a11y-comboboxentry-entry61">
+ <property name="AtkObject::accessible_name" translatable="yes">Network address</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <property name="model">model5</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer5"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="finger_user">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_entry">True</property>
+ <child internal-child="entry">
+ <object class="GtkEntry" id="comboboxentry-entry5">
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Enter the user to finger</property>
+ <accessibility>
+
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="a11y-comboboxentry-entry51">
+ <property name="AtkObject::accessible_name" translatable="yes">User name</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <property name="model">model6</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer6"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="finger_host_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Network address:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="finger_user_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Username:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox7">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <child>
+ <object class="GtkButton" id="finger_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <child>
+ <object class="GtkAlignment" id="alignment11">
+ <property name="visible">True</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox30">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image10">
+ <property name="visible">True</property>
+ <property name="stock">gtk-ok</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label78">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Finger</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow6">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">6</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <child>
+ <object class="GtkTextView" id="finger_output">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip-text" translatable="yes">Output for finger</property>
+ <property name="editable">False</property>
+ <accessibility>
+
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="a11y-finger_output1">
+ <property name="AtkObject::accessible_name" translatable="yes">Finger output</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="finger">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Finger</property>
+ </object>
+ <packing>
+ <property name="position">6</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox_whois">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkVBox" id="vbox22">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <property name="spacing">12</property>
+ <property name="expand">False</property>
+ <child>
+ <object class="GtkHBox" id="hbox38">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="whois_host_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Domain address:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="whois_host">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_entry">True</property>
+ <child internal-child="entry">
+ <object class="GtkEntry" id="comboboxentry-entry7">
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Enter a domain address to lookup its whois information. For example: www.domain.com or 192.168.2.1</property>
+ <accessibility>
+
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="a11y-comboboxentry-entry71">
+ <property name="AtkObject::accessible_name" translatable="yes">Domain address</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <property name="model">model7</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer7"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox8">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <child>
+ <object class="GtkButton" id="whois_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <child>
+ <object class="GtkAlignment" id="alignment12">
+ <property name="visible">True</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox32">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image11">
+ <property name="visible">True</property>
+ <property name="stock">gtk-ok</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label85">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Whois</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow7">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">6</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <child>
+ <object class="GtkTextView" id="whois_output">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip-text" translatable="yes">Output for whois</property>
+ <property name="editable">False</property>
+ <accessibility>
+
+
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="a11y-whois_output1">
+ <property name="AtkObject::accessible_description" translatable="yes">Whois output</property>
+ <property name="AtkObject::accessible_name" translatable="yes">Whois output</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="whois">
+ <property name="visible">True</property>
+ <property name="tooltip-text" translatable="yes">Output for whois</property>
+ <property name="label" translatable="yes">Whois</property>
+ <accessibility>
+
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="a11y-whois1">
+ <property name="AtkObject::accessible_name" translatable="yes">Whois output</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">7</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox42">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkProgressBar" id="progress_bar">
+ <property name="visible">True</property>
+ <property name="pulse_step">0.10000000149</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkStatusbar" id="statusbar">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+</interface>
diff -pruN 3.0.0-2/.pc/02_lpi.patch/src/main.c 3.0.1-0ubuntu1/.pc/02_lpi.patch/src/main.c
--- 3.0.0-2/.pc/02_lpi.patch/src/main.c 1970-01-01 00:00:00.000000000 +0000
+++ 3.0.1-0ubuntu1/.pc/02_lpi.patch/src/main.c 2012-01-03 09:10:16.000000000 +0000
@@ -0,0 +1,968 @@
+/* -*- mode:C; indent-tabs-mode:t; tab-width:8; c-basic-offset:8; -*- */
+
+/* gnome-netinfo - A GUI Interface for network utilities
+ * Copyright (C) 2002, 2003 by German Poo-Caaman~o
+ *
+ * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <string.h>
+#include <glib/gi18n.h>
+
+#include <glibtop.h>
+
+#include "callbacks.h"
+#include "ping.h"
+#include "traceroute.h"
+#include "info.h"
+#include "netstat.h"
+#include "scan.h"
+#include "lookup.h"
+#include "finger.h"
+#include "whois.h"
+#include "utils.h"
+#include "gn-combo-history.h"
+
+Netinfo *load_ping_widgets_from_builder (GtkBuilder * builder);
+Netinfo *load_traceroute_widgets_from_builder (GtkBuilder * builder);
+Netinfo *load_netstat_widgets_from_builder (GtkBuilder * builder);
+Netinfo *load_scan_widgets_from_builder (GtkBuilder * builder);
+Netinfo *load_lookup_widgets_from_builder (GtkBuilder * builder);
+Netinfo *load_finger_widgets_from_builder (GtkBuilder * builder);
+Netinfo *load_whois_widgets_from_builder (GtkBuilder * builder);
+Netinfo *load_info_widgets_from_builder (GtkBuilder * builder);
+static gboolean start_initial_process_cb (gpointer data);
+
+int
+main (int argc, char *argv[])
+{
+ GtkWidget *window;
+ GtkAction *menu_beep;
+ GtkBuilder *builder;
+ GtkWidget *notebook;
+ GtkWidget *statusbar;
+ const gchar *dialog = UI_DIR "gnome-nettool.ui";
+ Netinfo *pinger;
+ Netinfo *tracer;
+ Netinfo *netstat;
+ Netinfo *info;
+ Netinfo *scan;
+ Netinfo *lookup;
+ Netinfo *finger;
+ Netinfo *whois;
+ gint current_page = 0;
+ static gchar *info_input = NULL;
+ static gchar *ping_input = NULL;
+ static gchar *netstat_input = NULL;
+ static gchar *scan_input = NULL;
+ static gchar *traceroute_input = NULL;
+ static gchar *lookup_input = NULL;
+ static gchar *finger_input = NULL;
+ static gchar *whois_input = NULL;
+ GError *error = NULL;
+
+ GOptionEntry options[] = {
+ { "info", 'i', 0, G_OPTION_ARG_STRING, &info_input,
+ N_("Load information for a network device"),
+ N_("DEVICE") },
+
+ { "ping", 'p', 0, G_OPTION_ARG_STRING, &ping_input,
+ N_("Send a ping to a network address"),
+ N_("HOST") },
+
+ { "netstat", 'n', 0, G_OPTION_ARG_STRING, &netstat_input,
+ N_("Get netstat information. Valid options are: route, active, multicast."),
+ N_("COMMAND") },
+
+ { "traceroute", 't', 0, G_OPTION_ARG_STRING, &traceroute_input,
+ N_("Trace a route to a network address"),
+ N_("HOST") },
+
+ { "port-scan", 's', 0, G_OPTION_ARG_STRING, &scan_input,
+ N_("Port scan a network address"),
+ N_("HOST") },
+
+ { "lookup", 'l', 0, G_OPTION_ARG_STRING, &lookup_input,
+ N_("Look up a network address"),
+ N_("HOST") },
+
+ { "finger", 'f', 0, G_OPTION_ARG_STRING, &finger_input,
+ N_("Finger command to run"),
+ N_("USER") },
+
+ { "whois", 'w', 0, G_OPTION_ARG_STRING, &whois_input,
+ N_("Perform a whois lookup for a network domain"),
+ N_("DOMAIN") },
+
+ { NULL, '\0', 0, 0, NULL, NULL, NULL }
+ };
+
+#ifdef ENABLE_NLS
+ bindtextdomain (GETTEXT_PACKAGE, GNOME_NETTOOL_LOCALEDIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ textdomain (GETTEXT_PACKAGE);
+#endif
+
+ glibtop_init ();
+
+ if (!gtk_init_with_args (&argc, &argv, NULL, options, NULL, &error)) {
+ g_print ("%s\n\n", error->message);
+ return -1;
+ }
+
+ if (!g_file_test (dialog, G_FILE_TEST_EXISTS)) {
+ g_critical (_("The file %s doesn't exist, "
+ "please check if gnome-nettool is correctly installed"),
+ dialog);
+ return -1;
+ }
+
+ gtk_window_set_default_icon_name ("gnome-nettool");
+
+ builder = gtk_builder_new ();
+ gtk_builder_add_from_file (builder, dialog, NULL);
+ window = GTK_WIDGET (gtk_builder_get_object (builder, "main_window"));
+ statusbar = GTK_WIDGET (gtk_builder_get_object (builder, "statusbar"));
+ gtk_statusbar_push (GTK_STATUSBAR (statusbar), 0, _("Idle"));
+
+ g_signal_connect (G_OBJECT (window), "delete-event",
+ G_CALLBACK (gn_quit_app), NULL);
+
+ pinger = load_ping_widgets_from_builder (builder);
+ tracer = load_traceroute_widgets_from_builder (builder);
+ netstat = load_netstat_widgets_from_builder (builder);
+ info = load_info_widgets_from_builder (builder);
+ scan = load_scan_widgets_from_builder (builder);
+ lookup = load_lookup_widgets_from_builder (builder);
+ finger = load_finger_widgets_from_builder (builder);
+ whois = load_whois_widgets_from_builder (builder);
+
+ if (info_input) {
+ current_page = INFO;
+ info_set_nic (info, info_input);
+ }
+ if (ping_input) {
+ current_page = PING;
+ netinfo_set_host (pinger, ping_input);
+ g_idle_add (start_initial_process_cb, pinger);
+ }
+ if (netstat_input) {
+ current_page = NETSTAT;
+ if (! strcmp (netstat_input, "route"))
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON (netstat->routing), TRUE);
+ else if (! strcmp (netstat_input, "active"))
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON (netstat->protocol), TRUE);
+ else if (! strcmp (netstat_input, "multicast"))
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON (netstat->multicast), TRUE);
+ g_idle_add (start_initial_process_cb, netstat);
+ }
+ if (traceroute_input) {
+ current_page = TRACEROUTE;
+ netinfo_set_host (tracer, traceroute_input);
+ g_idle_add (start_initial_process_cb, tracer);
+ }
+ if (scan_input) {
+ current_page = PORTSCAN;
+ netinfo_set_host (scan, scan_input);
+ g_idle_add (start_initial_process_cb, scan);
+ }
+ if (lookup_input) {
+ current_page = LOOKUP;
+ netinfo_set_host (lookup, lookup_input);
+ g_idle_add (start_initial_process_cb, lookup);
+ }
+ if (finger_input) {
+ gchar **split_input = NULL;
+ current_page = FINGER;
+ split_input = g_strsplit (finger_input, "@", 2);
+ if (split_input[0])
+ netinfo_set_user (finger, split_input[0]);
+ if (split_input[1])
+ netinfo_set_host (finger, split_input[1]);
+ g_strfreev (split_input);
+ g_idle_add (start_initial_process_cb, finger);
+ }
+ if (whois_input) {
+ current_page = WHOIS;
+ netinfo_set_host (whois, whois_input);
+ g_idle_add (start_initial_process_cb, whois);
+ }
+
+ notebook = GTK_WIDGET (gtk_builder_get_object (builder, "notebook"));
+ g_object_set_data (G_OBJECT (notebook), "pinger", pinger);
+ g_object_set_data (G_OBJECT (notebook), "tracer", tracer);
+ g_object_set_data (G_OBJECT (notebook), "netstat", netstat);
+ g_object_set_data (G_OBJECT (notebook), "info", info);
+ g_object_set_data (G_OBJECT (notebook), "scan", scan);
+ g_object_set_data (G_OBJECT (notebook), "lookup", lookup);
+ g_object_set_data (G_OBJECT (notebook), "finger", finger);
+ g_object_set_data (G_OBJECT (notebook), "whois", whois);
+
+ menu_beep = GTK_ACTION (gtk_builder_get_object (builder, "m_beep"));
+
+ g_signal_connect (G_OBJECT (menu_beep), "activate",
+ G_CALLBACK (on_beep_activate),
+ (gpointer) pinger);
+
+ gtk_builder_connect_signals (builder, NULL);
+ g_object_unref (G_OBJECT (builder));
+
+ gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), current_page);
+
+ gtk_widget_show (window);
+
+ gtk_main ();
+
+ glibtop_close ();
+
+ g_free (pinger);
+ g_free (tracer);
+ g_free (netstat);
+ g_free (info);
+ g_free (scan);
+ g_free (lookup);
+ g_free (finger);
+ g_free (whois);
+
+ return 0;
+}
+
+static gboolean
+start_initial_process_cb (gpointer data)
+{
+ Netinfo *ni = data;
+ NetinfoActivateFn fn_cb;
+
+ g_return_val_if_fail (data != NULL, FALSE);
+
+ fn_cb = (NetinfoActivateFn) ni->button_callback;
+ if (fn_cb)
+ (*fn_cb) (ni->button, data);
+ return FALSE;
+}
+
+/* The value returned must be released from memory */
+Netinfo *
+load_ping_widgets_from_builder (GtkBuilder * builder)
+{
+ Netinfo *pinger;
+ GtkWidget *vbox_ping;
+ GtkWidget *label;
+ GtkEntry *entry_host;
+ GtkTreeModel *model;
+ GtkEntryCompletion *completion;
+
+ g_return_val_if_fail (builder != NULL, NULL);
+
+ pinger = g_new0 (Netinfo, 1);
+
+ pinger->main_window = GTK_WIDGET (gtk_builder_get_object (builder, "main_window"));
+ pinger->progress_bar = GTK_WIDGET (gtk_builder_get_object (builder, "progress_bar"));
+ pinger->page_label = GTK_WIDGET (gtk_builder_get_object (builder, "ping"));
+ pinger->running = FALSE;
+ pinger->child_pid = 0;
+ pinger->host = GTK_WIDGET (gtk_builder_get_object (builder, "ping_host"));
+ pinger->count = GTK_WIDGET (gtk_builder_get_object (builder, "ping_count"));
+ pinger->output = GTK_WIDGET (gtk_builder_get_object (builder, "ping_output"));
+ pinger->limited = GTK_WIDGET (gtk_builder_get_object (builder, "ping_limited"));
+ pinger->button = GTK_WIDGET (gtk_builder_get_object (builder, "ping_button"));
+ pinger->graph = GTK_WIDGET (gtk_builder_get_object (builder, "ping_graph"));
+ pinger->sensitive = pinger->host;
+ pinger->label_run = _("Ping");
+ pinger->label_stop = NULL;
+ pinger->routing = NULL;
+ pinger->protocol = NULL;
+ pinger->multicast = NULL;
+ pinger->min = GTK_WIDGET (gtk_builder_get_object (builder, "ping_minimum"));
+ pinger->avg = GTK_WIDGET (gtk_builder_get_object (builder, "ping_average"));
+ pinger->max = GTK_WIDGET (gtk_builder_get_object (builder, "ping_maximum"));
+ pinger->packets_transmitted = GTK_WIDGET (gtk_builder_get_object (builder, "ping_packets_transmitted"));
+ pinger->packets_received = GTK_WIDGET (gtk_builder_get_object (builder, "ping_packets_received"));
+ pinger->packets_success = GTK_WIDGET (gtk_builder_get_object (builder, "ping_packets_success"));
+
+ pinger->status_bar = GTK_WIDGET (gtk_builder_get_object (builder, "statusbar"));
+ pinger->stbar_text = NULL;
+
+ vbox_ping = GTK_WIDGET (gtk_builder_get_object (builder, "vbox_ping"));
+
+ label = GTK_WIDGET (gtk_builder_get_object (builder, "ping_host_label"));
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), pinger->host);
+
+ pinger->button_callback = G_CALLBACK (on_ping_activate);
+ pinger->process_line = NETINFO_FOREACH_FUNC (ping_foreach_with_tree);
+ pinger->copy_output = NETINFO_COPY_FUNC (ping_copy_to_clipboard);
+
+ model = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING));
+ gtk_combo_box_set_model (GTK_COMBO_BOX (pinger->host), model);
+ g_object_unref (model);
+
+ gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (pinger->host), 0);
+
+ entry_host = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (pinger->host)));
+
+ completion = gtk_entry_completion_new ();
+ gtk_entry_set_completion (entry_host, completion);
+ g_object_unref (completion);
+ gtk_entry_completion_set_model (completion, model);
+ gtk_entry_completion_set_text_column (completion, 0);
+ g_object_unref (model);
+
+ pinger->history = gn_combo_history_new ();
+ gn_combo_history_set_id (pinger->history, "hostnames");
+ gn_combo_history_set_combo (pinger->history, GTK_COMBO_BOX (pinger->host));
+
+ g_signal_connect (G_OBJECT (entry_host), "activate",
+ G_CALLBACK (on_ping_activate),
+ pinger);
+ g_signal_connect (G_OBJECT (pinger->limited), "toggled",
+ G_CALLBACK (on_ping_toggled),
+ pinger);
+ g_signal_connect (G_OBJECT (pinger->button), "clicked",
+ pinger->button_callback,
+ pinger);
+ g_signal_connect (G_OBJECT (pinger->graph), "draw",
+ G_CALLBACK (on_ping_graph_draw),
+ pinger);
+
+ return pinger;
+}
+
+/* The value returned must be released from memory */
+Netinfo *
+load_traceroute_widgets_from_builder (GtkBuilder * builder)
+{
+ Netinfo *tracer;
+ GtkWidget *vbox_traceroute;
+ GtkWidget *label;
+ GtkEntry *entry_host;
+ GtkTreeModel *model;
+ GtkEntryCompletion *completion;
+
+ g_return_val_if_fail (builder != NULL, NULL);
+
+ tracer = g_new0 (Netinfo, 1);
+
+ tracer->main_window = GTK_WIDGET (gtk_builder_get_object (builder, "main_window"));
+ tracer->progress_bar = GTK_WIDGET (gtk_builder_get_object (builder, "progress_bar"));
+ tracer->page_label = GTK_WIDGET (gtk_builder_get_object (builder, "traceroute"));
+ tracer->running = FALSE;
+ tracer->child_pid = 0;
+ tracer->host = GTK_WIDGET (gtk_builder_get_object (builder, "traceroute_host"));
+ tracer->output = GTK_WIDGET (gtk_builder_get_object (builder, "traceroute_output"));
+ tracer->button = GTK_WIDGET (gtk_builder_get_object (builder, "traceroute_button"));
+ tracer->count = NULL;
+ tracer->limited = NULL;
+ tracer->sensitive = tracer->host;
+ tracer->label_run = _("Trace");
+ tracer->label_stop = NULL;
+ tracer->routing = NULL;
+ tracer->protocol = NULL;
+ tracer->multicast = NULL;
+
+ tracer->status_bar = GTK_WIDGET (gtk_builder_get_object (builder, "statusbar"));
+ tracer->stbar_text = NULL;
+
+ vbox_traceroute = GTK_WIDGET (gtk_builder_get_object (builder, "vbox_traceroute"));
+
+ label = GTK_WIDGET (gtk_builder_get_object (builder, "traceroute_host_label"));
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), tracer->host);
+
+ tracer->button_callback = G_CALLBACK (on_traceroute_activate);
+ tracer->process_line = NETINFO_FOREACH_FUNC (traceroute_foreach_with_tree);
+ tracer->copy_output = NETINFO_COPY_FUNC (traceroute_copy_to_clipboard);
+
+ model = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING));
+ gtk_combo_box_set_model (GTK_COMBO_BOX (tracer->host), model);
+ g_object_unref (model);
+
+ gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (tracer->host), 0);
+
+ entry_host = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (tracer->host)));
+
+ completion = gtk_entry_completion_new ();
+ gtk_entry_set_completion (entry_host, completion);
+ g_object_unref (completion);
+ gtk_entry_completion_set_model (completion, model);
+ gtk_entry_completion_set_text_column (completion, 0);
+ g_object_unref (model);
+
+ tracer->history = gn_combo_history_new ();
+ gn_combo_history_set_id (tracer->history, "hostnames");
+ gn_combo_history_set_combo (tracer->history, GTK_COMBO_BOX (tracer->host));
+
+ g_signal_connect (G_OBJECT (entry_host), "activate",
+ G_CALLBACK (on_traceroute_activate),
+ tracer);
+ g_signal_connect (G_OBJECT (tracer->button), "clicked",
+ tracer->button_callback,
+ tracer);
+
+ return tracer;
+}
+
+Netinfo *
+load_netstat_widgets_from_builder (GtkBuilder * builder)
+{
+ Netinfo *netstat;
+ GtkWidget *vbox_netstat;
+
+ g_return_val_if_fail (builder != NULL, NULL);
+
+ netstat = g_new0 (Netinfo, 1);
+
+ netstat->main_window = GTK_WIDGET (gtk_builder_get_object (builder, "main_window"));
+ netstat->progress_bar = GTK_WIDGET (gtk_builder_get_object (builder, "progress_bar"));
+ netstat->page_label = GTK_WIDGET (gtk_builder_get_object (builder, "netstat"));
+ netstat->running = FALSE;
+ netstat->child_pid = 0;
+ netstat->host = NULL;
+ netstat->count = NULL;
+ netstat->output = GTK_WIDGET (gtk_builder_get_object (builder, "netstat_output"));
+ netstat->limited = NULL;
+ netstat->button = GTK_WIDGET (gtk_builder_get_object (builder, "netstat_button"));
+ netstat->routing = GTK_WIDGET (gtk_builder_get_object (builder, "netstat_routing"));
+ netstat->protocol = GTK_WIDGET (gtk_builder_get_object (builder, "netstat_protocol"));
+ netstat->multicast = GTK_WIDGET (gtk_builder_get_object (builder, "netstat_multicast"));
+ netstat->sensitive = NULL;
+ netstat->label_run = _("Netstat");
+ netstat->label_stop = NULL;
+
+ netstat->status_bar = GTK_WIDGET (gtk_builder_get_object (builder, "statusbar"));
+ netstat->stbar_text = NULL;
+
+ vbox_netstat = GTK_WIDGET (gtk_builder_get_object (builder, "vbox_netstat"));
+
+ netstat->button_callback = G_CALLBACK (on_netstat_activate);
+ netstat->process_line = NETINFO_FOREACH_FUNC (netstat_foreach_with_tree);
+ netstat->copy_output = NETINFO_COPY_FUNC (netstat_copy_to_clipboard);
+
+ g_signal_connect (G_OBJECT (netstat->button), "clicked",
+ netstat->button_callback,
+ netstat);
+/*
+ g_signal_connect (G_OBJECT (netstat->protocol), "toggled",
+ G_CALLBACK (on_protocol_button_toggled),
+ netstat);
+ g_signal_connect (G_OBJECT (netstat->routing), "toggled",
+ G_CALLBACK (on_protocol_button_toggled),
+ netstat);
+ g_signal_connect (G_OBJECT (netstat->multicast), "toggled",
+ G_CALLBACK (on_protocol_button_toggled),
+ netstat);
+*/
+ return netstat;
+}
+
+static void
+info_list_ip_addr_add_columns (GtkWidget *list_ip_addr)
+{
+ GtkTreeViewColumn *column;
+ GtkCellRenderer *renderer;
+
+ renderer = gtk_cell_renderer_text_new ();
+ column = gtk_tree_view_column_new_with_attributes (_("Protocol"),
+ renderer,
+ "text", 0,
+ NULL);
+ gtk_tree_view_insert_column (GTK_TREE_VIEW (list_ip_addr), column, 0);
+
+ renderer = gtk_cell_renderer_text_new ();
+ column = gtk_tree_view_column_new_with_attributes (_("IP Address"),
+ renderer,
+ "text", 1,
+ NULL);
+ gtk_tree_view_insert_column (GTK_TREE_VIEW (list_ip_addr), column, 1);
+
+ renderer = gtk_cell_renderer_text_new ();
+ column = gtk_tree_view_column_new_with_attributes (_("Netmask / Prefix"),
+ renderer,
+ "text", 2,
+ NULL);
+ gtk_tree_view_insert_column (GTK_TREE_VIEW (list_ip_addr), column, 2);
+
+ renderer = gtk_cell_renderer_text_new ();
+ column = gtk_tree_view_column_new_with_attributes (_("Broadcast"),
+ renderer,
+ "text", 3,
+ NULL);
+ gtk_tree_view_insert_column (GTK_TREE_VIEW (list_ip_addr), column, 3);
+
+ renderer = gtk_cell_renderer_text_new ();
+ column = gtk_tree_view_column_new_with_attributes (_("Scope"),
+ renderer,
+ "text", 4,
+ NULL);
+ gtk_tree_view_insert_column (GTK_TREE_VIEW (list_ip_addr), column, 4);
+
+
+}
+
+/* The value returned must be released from memory */
+Netinfo *
+load_info_widgets_from_builder (GtkBuilder * builder)
+{
+ Netinfo *info;
+ GtkTreeModel *model;
+ GtkWidget *label1;
+
+ g_return_val_if_fail (builder != NULL, NULL);
+
+ info = g_malloc (sizeof (Netinfo));
+
+ info->main_window = GTK_WIDGET (gtk_builder_get_object (builder, "main_window"));
+ info->running = FALSE;
+ info->combo = GTK_WIDGET (gtk_builder_get_object (builder, "info_combo"));
+ info->ipv6_frame = GTK_WIDGET (gtk_builder_get_object (builder, "info_ipv6_frame"));
+ info->progress_bar = GTK_WIDGET (gtk_builder_get_object (builder, "progress_bar"));
+ info->page_label = GTK_WIDGET (gtk_builder_get_object (builder, "device"));
+ info->hw_address = GTK_WIDGET (gtk_builder_get_object (builder, "info_hw_address"));
+ info->ip_address = GTK_WIDGET (gtk_builder_get_object (builder, "info_ip_address"));
+ info->netmask = GTK_WIDGET (gtk_builder_get_object (builder, "info_netmask"));
+ info->broadcast = GTK_WIDGET (gtk_builder_get_object (builder, "info_broadcast"));
+ info->multicast = GTK_WIDGET (gtk_builder_get_object (builder, "info_multicast"));
+ info->link_speed = GTK_WIDGET (gtk_builder_get_object (builder, "info_link_speed"));
+ info->state = GTK_WIDGET (gtk_builder_get_object (builder, "info_state"));
+ info->mtu = GTK_WIDGET (gtk_builder_get_object (builder, "info_mtu"));
+ info->tx_bytes = GTK_WIDGET (gtk_builder_get_object (builder, "info_tx_bytes"));
+ info->tx = GTK_WIDGET (gtk_builder_get_object (builder, "info_tx"));
+ info->tx_errors = GTK_WIDGET (gtk_builder_get_object (builder, "info_tx_errors"));
+ info->rx_bytes = GTK_WIDGET (gtk_builder_get_object (builder, "info_rx_bytes"));
+ info->rx = GTK_WIDGET (gtk_builder_get_object (builder, "info_rx"));
+ info->rx_errors = GTK_WIDGET (gtk_builder_get_object (builder, "info_rx_errors"));
+ info->collisions = GTK_WIDGET (gtk_builder_get_object (builder, "info_collisions"));
+ info->list_ip_addr = GTK_WIDGET (gtk_builder_get_object (builder, "info_list_ip_addr"));
+ info->configure_button = GTK_WIDGET (gtk_builder_get_object (builder, "info_configure_button"));
+
+ info->status_bar = GTK_WIDGET (gtk_builder_get_object (builder, "statusbar"));
+ info->stbar_text = NULL;
+
+ model = GTK_TREE_MODEL (gtk_list_store_new (5, G_TYPE_STRING, G_TYPE_STRING,
+ G_TYPE_STRING, G_TYPE_STRING,
+ G_TYPE_STRING));
+ gtk_tree_view_set_model (GTK_TREE_VIEW (info->list_ip_addr), model);
+ g_object_unref (model);
+
+ info_list_ip_addr_add_columns (info->list_ip_addr);
+
+ label1 = GTK_WIDGET (gtk_builder_get_object (builder, "info_combo_label"));
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label1), info->combo);
+
+ model = GTK_TREE_MODEL (gtk_list_store_new (3, GDK_TYPE_PIXBUF,
+ G_TYPE_STRING,
+ G_TYPE_POINTER));
+ gtk_combo_box_set_model (GTK_COMBO_BOX (info->combo), model);
+
+ g_object_unref (model);
+
+ g_signal_connect (G_OBJECT (info->configure_button), "clicked",
+ G_CALLBACK (on_configure_button_clicked),
+ info);
+
+ g_signal_connect (G_OBJECT (info->combo), "changed",
+ G_CALLBACK (info_nic_changed),
+ info);
+
+ info_load_iface (info);
+ info->copy_output = NETINFO_COPY_FUNC (info_copy_to_clipboard);
+
+ return info;
+}
+
+Netinfo *
+load_scan_widgets_from_builder (GtkBuilder * builder)
+{
+ Netinfo *scan;
+ GtkEntry *entry_host;
+ GtkWidget *label;
+ GtkTreeModel *model;
+ GtkEntryCompletion *completion;
+
+ g_return_val_if_fail (builder != NULL, NULL);
+
+ scan = g_new0 (Netinfo, 1);
+
+ scan->main_window = GTK_WIDGET (gtk_builder_get_object (builder, "main_window"));
+ scan->progress_bar = GTK_WIDGET (gtk_builder_get_object (builder, "progress_bar"));
+ scan->page_label = GTK_WIDGET (gtk_builder_get_object (builder, "scan"));
+ scan->running = FALSE;
+ scan->child_pid = 0;
+ scan->host = GTK_WIDGET (gtk_builder_get_object (builder, "scan_host"));
+ scan->count = NULL;
+ scan->output = GTK_WIDGET (gtk_builder_get_object (builder, "scan_output"));
+ scan->limited = NULL;
+ scan->button = GTK_WIDGET (gtk_builder_get_object (builder, "scan_button"));
+ scan->routing = NULL;
+ scan->protocol = NULL;
+ scan->multicast = NULL;
+ scan->sensitive = NULL;
+ scan->label_run = _("Scan");
+ scan->label_stop = NULL;
+
+ scan->status_bar = GTK_WIDGET (gtk_builder_get_object (builder, "statusbar"));
+ scan->stbar_text = NULL;
+
+ label = GTK_WIDGET (gtk_builder_get_object (builder, "scan_host_label"));
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), scan->host);
+
+ scan->button_callback = G_CALLBACK (on_scan_activate);
+ scan->copy_output = NETINFO_COPY_FUNC (scan_copy_to_clipboard);
+ scan->process_line = NETINFO_FOREACH_FUNC (scan_foreach);
+
+ model = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING));
+ gtk_combo_box_set_model (GTK_COMBO_BOX (scan->host), model);
+ g_object_unref (model);
+
+ gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (scan->host), 0);
+
+ entry_host = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (scan->host)));
+
+ completion = gtk_entry_completion_new ();
+ gtk_entry_set_completion (entry_host, completion);
+ g_object_unref (completion);
+ gtk_entry_completion_set_model (completion, model);
+ gtk_entry_completion_set_text_column (completion, 0);
+ g_object_unref (model);
+
+ scan->history = gn_combo_history_new ();
+ gn_combo_history_set_id (scan->history, "hostnames");
+ gn_combo_history_set_combo (scan->history, GTK_COMBO_BOX (scan->host));
+
+ g_signal_connect (G_OBJECT (entry_host), "activate",
+ scan->button_callback,
+ scan);
+ g_signal_connect (G_OBJECT (scan->button), "clicked",
+ scan->button_callback,
+ scan);
+
+ return scan;
+}
+
+static void
+nettool_lookup_setup_combo_type (Netinfo *lookup)
+{
+ gint i;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ GtkCellRenderer *renderer;
+ gchar *types[] = {
+ N_("Default Information"),
+ N_("Internet Address"),
+ N_("Canonical Name"),
+ N_("CPU / OS Type"),
+ /* When asking for MX record in DNS context */
+ N_("Mailbox Exchange"),
+ N_("Mailbox Information"),
+ /* When asking for NS record in DNS context */
+ N_("Name Server"),
+ N_("Host name for Address"),
+ N_("Start-of-authority"),
+ N_("Text Information"),
+ N_("Well Known Services"),
+ N_("Any / All Information"),
+ NULL
+ };
+
+ model = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING));
+
+ for (i=0; types[i]; i++) {
+ gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+ gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+ 0, _(types[i]), -1);
+ }
+
+ gtk_combo_box_set_model (GTK_COMBO_BOX (lookup->type), model);
+
+ g_object_unref (model);
+
+ gtk_cell_layout_clear (GTK_CELL_LAYOUT (lookup->type));
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (lookup->type), renderer, TRUE);
+ gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (lookup->type), renderer,
+ "text", 0, NULL);
+
+ gtk_combo_box_set_active (GTK_COMBO_BOX (lookup->type), 0);
+}
+
+/* The value returned must be released from memory */
+Netinfo *
+load_lookup_widgets_from_builder (GtkBuilder * builder)
+{
+ Netinfo *lookup;
+ GtkWidget *vbox_lookup;
+ GtkWidget *label;
+ GtkEntry *entry_host;
+ GtkTreeModel *model;
+ GtkEntryCompletion *completion;
+
+ g_return_val_if_fail (builder != NULL, NULL);
+
+ lookup = g_new0 (Netinfo, 1);
+
+ lookup->main_window = GTK_WIDGET (gtk_builder_get_object (builder, "main_window"));
+ lookup->progress_bar = GTK_WIDGET (gtk_builder_get_object (builder, "progress_bar"));
+ lookup->page_label = GTK_WIDGET (gtk_builder_get_object (builder, "lookup"));
+ lookup->running = FALSE;
+ lookup->child_pid = 0;
+ lookup->host = GTK_WIDGET (gtk_builder_get_object (builder, "lookup_host"));
+ lookup->output = GTK_WIDGET (gtk_builder_get_object (builder, "lookup_output"));
+ lookup->button = GTK_WIDGET (gtk_builder_get_object (builder, "lookup_button"));
+ lookup->type = GTK_WIDGET (gtk_builder_get_object (builder, "lookup_type"));
+ lookup->count = NULL;
+ lookup->limited = NULL;
+ lookup->sensitive = lookup->host;
+ lookup->label_run = _("Lookup");
+ lookup->label_stop = NULL;
+ lookup->routing = NULL;
+ lookup->protocol = NULL;
+ lookup->multicast = NULL;
+
+ lookup->status_bar = GTK_WIDGET (gtk_builder_get_object (builder, "statusbar"));
+ lookup->stbar_text = NULL;
+
+ vbox_lookup = GTK_WIDGET (gtk_builder_get_object (builder, "vbox_lookup"));
+
+ label = GTK_WIDGET (gtk_builder_get_object (builder, "lookup_host_label"));
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), lookup->host);
+ label = GTK_WIDGET (gtk_builder_get_object (builder, "lookup_type_label"));
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), lookup->type);
+
+ lookup->button_callback = G_CALLBACK (on_lookup_activate);
+ lookup->process_line = NETINFO_FOREACH_FUNC (lookup_foreach_with_tree);
+ lookup->copy_output = NETINFO_COPY_FUNC (lookup_copy_to_clipboard);
+
+ nettool_lookup_setup_combo_type (lookup);
+
+ model = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING));
+ gtk_combo_box_set_model (GTK_COMBO_BOX (lookup->host), model);
+ g_object_unref (model);
+
+ gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (lookup->host), 0);
+
+ entry_host = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (lookup->host)));
+
+ completion = gtk_entry_completion_new ();
+ gtk_entry_set_completion (entry_host, completion);
+ g_object_unref (completion);
+ gtk_entry_completion_set_model (completion, model);
+ gtk_entry_completion_set_text_column (completion, 0);
+ g_object_unref (model);
+
+ lookup->history = gn_combo_history_new ();
+ gn_combo_history_set_id (lookup->history, "hostnames");
+ gn_combo_history_set_combo (lookup->history, GTK_COMBO_BOX (lookup->host));
+
+ g_signal_connect (G_OBJECT (entry_host), "activate",
+ G_CALLBACK (on_lookup_activate),
+ lookup);
+ g_signal_connect (G_OBJECT (lookup->button), "clicked",
+ lookup->button_callback,
+ lookup);
+
+ return lookup;
+}
+
+/* The value returned must be released from memory */
+Netinfo *
+load_finger_widgets_from_builder (GtkBuilder * builder)
+{
+ Netinfo *finger;
+ GtkWidget *vbox_finger;
+ GtkWidget *label;
+ PangoFontDescription *font_desc;
+ GtkEntry *entry_host;
+ GtkTreeModel *model;
+ GtkEntryCompletion *completion;
+
+ g_return_val_if_fail (builder != NULL, NULL);
+
+ finger = g_new0 (Netinfo, 1);
+
+ finger->main_window = GTK_WIDGET (gtk_builder_get_object (builder, "main_window"));
+ finger->progress_bar = GTK_WIDGET (gtk_builder_get_object (builder, "progress_bar"));
+ finger->page_label = GTK_WIDGET (gtk_builder_get_object (builder, "finger"));
+ finger->running = FALSE;
+ finger->child_pid = 0;
+ finger->user = GTK_WIDGET (gtk_builder_get_object (builder, "finger_user"));
+ finger->host = GTK_WIDGET (gtk_builder_get_object (builder, "finger_host"));
+ finger->output = GTK_WIDGET (gtk_builder_get_object (builder, "finger_output"));
+ finger->button = GTK_WIDGET (gtk_builder_get_object (builder, "finger_button"));
+ finger->type = GTK_WIDGET (gtk_builder_get_object (builder, "finger_type"));
+ finger->count = NULL;
+ finger->limited = NULL;
+ finger->sensitive = GTK_WIDGET (gtk_builder_get_object (builder, "finger_input_box"));
+ finger->label_run = _("Finger");
+ finger->label_stop = NULL;
+ finger->routing = NULL;
+ finger->protocol = NULL;
+ finger->multicast = NULL;
+
+ finger->status_bar = GTK_WIDGET (gtk_builder_get_object (builder, "statusbar"));
+ finger->stbar_text = NULL;
+
+ vbox_finger = GTK_WIDGET (gtk_builder_get_object (builder, "vbox_finger"));
+
+ label = GTK_WIDGET (gtk_builder_get_object (builder, "finger_user_label"));
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), finger->user);
+ label = GTK_WIDGET (gtk_builder_get_object (builder, "finger_host_label"));
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), finger->host);
+
+ font_desc = pango_font_description_new ();
+ pango_font_description_set_family (font_desc, "monospace");
+ gtk_widget_modify_font (finger->output, font_desc);
+ pango_font_description_free (font_desc);
+
+ finger->button_callback = G_CALLBACK (on_finger_activate);
+ finger->process_line = NETINFO_FOREACH_FUNC (finger_foreach);
+ finger->copy_output = NETINFO_COPY_FUNC (finger_copy_to_clipboard);
+
+ model = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING));
+ gtk_combo_box_set_model (GTK_COMBO_BOX (finger->user), model);
+ g_object_unref (model);
+
+ gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (finger->user), 0);
+
+ entry_host = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (finger->user)));
+
+ completion = gtk_entry_completion_new ();
+ gtk_entry_set_completion (entry_host, completion);
+ g_object_unref (completion);
+ gtk_entry_completion_set_model (completion, model);
+ gtk_entry_completion_set_text_column (completion, 0);
+ g_object_unref (model);
+
+ finger->history_user = gn_combo_history_new ();
+ gn_combo_history_set_id (finger->history_user, "usernames");
+ gn_combo_history_set_combo (finger->history_user, GTK_COMBO_BOX (finger->user));
+
+ g_signal_connect (G_OBJECT (entry_host), "activate",
+ G_CALLBACK (on_finger_activate),
+ finger);
+
+ model = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING));
+ gtk_combo_box_set_model (GTK_COMBO_BOX (finger->host), model);
+ g_object_unref (model);
+
+ gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (finger->host), 0);
+
+ entry_host = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (finger->host)));
+
+ completion = gtk_entry_completion_new ();
+ gtk_entry_set_completion (entry_host, completion);
+ g_object_unref (completion);
+ gtk_entry_completion_set_model (completion, model);
+ gtk_entry_completion_set_text_column (completion, 0);
+ g_object_unref (model);
+
+ finger->history = gn_combo_history_new ();
+ gn_combo_history_set_id (finger->history, "hostnames");
+ gn_combo_history_set_combo (finger->history, GTK_COMBO_BOX (finger->host));
+
+ g_signal_connect (G_OBJECT (entry_host), "activate",
+ G_CALLBACK (on_finger_activate),
+ finger);
+
+ g_signal_connect (G_OBJECT (finger->button), "clicked",
+ finger->button_callback,
+ finger);
+
+ return finger;
+}
+
+/* The value returned must be released from memory */
+Netinfo *
+load_whois_widgets_from_builder (GtkBuilder * builder)
+{
+ Netinfo *whois;
+ GtkWidget *vbox_whois;
+ GtkWidget *label;
+ GtkEntry *entry_host;
+ GtkTreeModel *model;
+ GtkEntryCompletion *completion;
+ PangoFontDescription *font_desc;
+
+
+ g_return_val_if_fail (builder != NULL, NULL);
+
+ whois = g_new0 (Netinfo, 1);
+
+ whois->main_window = GTK_WIDGET (gtk_builder_get_object (builder, "main_window"));
+ whois->progress_bar = GTK_WIDGET (gtk_builder_get_object (builder, "progress_bar"));
+ whois->page_label = GTK_WIDGET (gtk_builder_get_object (builder, "whois"));
+ whois->running = FALSE;
+ whois->child_pid = 0;
+ whois->host = GTK_WIDGET (gtk_builder_get_object (builder, "whois_host"));
+ whois->output = GTK_WIDGET (gtk_builder_get_object (builder, "whois_output"));
+ whois->button = GTK_WIDGET (gtk_builder_get_object (builder, "whois_button"));
+ whois->count = NULL;
+ whois->limited = NULL;
+ whois->sensitive = GTK_WIDGET (gtk_builder_get_object (builder, "whois_input_box"));
+ whois->label_run = _("Whois");
+ whois->label_stop = NULL;
+ whois->routing = NULL;
+ whois->protocol = NULL;
+ whois->multicast = NULL;
+
+ whois->status_bar = GTK_WIDGET (gtk_builder_get_object (builder, "statusbar"));
+ whois->stbar_text = NULL;
+
+ vbox_whois = GTK_WIDGET (gtk_builder_get_object (builder, "vbox_whois"));
+
+ label = GTK_WIDGET (gtk_builder_get_object (builder, "whois_host_label"));
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), whois->host);
+
+ font_desc = pango_font_description_new ();
+ pango_font_description_set_family (font_desc, "monospace");
+ gtk_widget_modify_font (whois->output, font_desc);
+ pango_font_description_free (font_desc);
+
+ whois->button_callback = G_CALLBACK (on_whois_activate);
+ whois->process_line = NETINFO_FOREACH_FUNC (whois_foreach);
+ whois->copy_output = NETINFO_COPY_FUNC (whois_copy_to_clipboard);
+
+ model = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING));
+ gtk_combo_box_set_model (GTK_COMBO_BOX (whois->host), model);
+ g_object_unref (model);
+
+ gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (whois->host), 0);
+
+ entry_host = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (whois->host)));
+
+ completion = gtk_entry_completion_new ();
+ gtk_entry_set_completion (entry_host, completion);
+ g_object_unref (completion);
+ gtk_entry_completion_set_model (completion, model);
+ gtk_entry_completion_set_text_column (completion, 0);
+ g_object_unref (model);
+
+ whois->history = gn_combo_history_new ();
+ gn_combo_history_set_id (whois->history, "domains");
+ gn_combo_history_set_combo (whois->history, GTK_COMBO_BOX (whois->host));
+
+ g_signal_connect (G_OBJECT (entry_host), "activate",
+ G_CALLBACK (on_whois_activate),
+ whois);
+ g_signal_connect (G_OBJECT (whois->button), "clicked",
+ whois->button_callback,
+ whois);
+
+ return whois;
+}
diff -pruN 3.0.0-2/.pc/03_fix_ifaces.patch/src/info.c 3.0.1-0ubuntu1/.pc/03_fix_ifaces.patch/src/info.c
--- 3.0.0-2/.pc/03_fix_ifaces.patch/src/info.c 2010-12-02 09:26:14.000000000 +0000
+++ 3.0.1-0ubuntu1/.pc/03_fix_ifaces.patch/src/info.c 1970-01-01 00:00:00.000000000 +0000
@@ -1,599 +0,0 @@
-/* -*- mode:C; indent-tabs-mode:t; tab-width:8; c-basic-offset:8; -*- */
-/* gnome-netinfo - A GUI Interface for network utilities
- * Copyright (C) 2002, 2003 by German Poo-Caaman~o
- *
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <glib/gprintf.h>
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef HAVE_SYS_SOCKIO_H
-# include <sys/sockio.h>
-#endif
-
-
-#include <netinet/in.h>
-#include <sys/socket.h> /* basic socket definitions */
-#include <arpa/inet.h> /* inet(3) functions */
-#include <sys/un.h> /* for Unix domain sockets */
-#include <sys/ioctl.h>
-#include <stdlib.h>
-#include <net/if.h>
-
-#include <glibtop.h>
-#include <glibtop/netlist.h>
-#include <glibtop/netload.h>
-
-#include "info.h"
-#include "utils.h"
-#include "util-mii.h"
-
-#ifndef IN6_IS_ADDR_GLOBAL
-#define IN6_IS_ADDR_GLOBAL(a) \
- (((((__const uint8_t *) (a))[0] & 0xff) == 0x3f \
- || (((__const uint8_t *) (a))[0] & 0xff) == 0x20))
-#endif
-
-static gboolean info_nic_update_stats (gpointer data);
-static GList *info_get_interfaces (Netinfo *info);
-
-static InfoInterfaceDescription info_iface_desc [] = {
- /* Interface Name Interface Type icon Device prefix Pixbuf */
- { N_("Other type"), INFO_INTERFACE_OTHER, "network.png", "other_type", NULL },
- { N_("Ethernet Interface"), INFO_INTERFACE_ETH, "16_ethernet.xpm", "eth", NULL },
- { N_("Wireless Interface"), INFO_INTERFACE_WLAN, "wavelan-16.png", "wlan", NULL },
- { N_("Modem Interface"), INFO_INTERFACE_PPP, "16_ppp.xpm", "ppp", NULL },
- { N_("Parallel Line Interface"), INFO_INTERFACE_PLIP, "16_plip.xpm", "plip", NULL },
- { N_("Infrared Interface"), INFO_INTERFACE_IRLAN, "irda-16.png", "irlan", NULL },
- { N_("Loopback Interface"), INFO_INTERFACE_LO, "16_loopback.xpm", "lo", NULL },
- { N_("Unknown Interface"), INFO_INTERFACE_UNKNOWN, "network.png", "", NULL },
- { NULL, INFO_INTERFACE_UNKNOWN, NULL, NULL, NULL }
-};
-
-void
-info_do (const gchar * nic, Netinfo * info)
-{
-
-}
-
-void
-info_set_nic (Netinfo * netinfo, const gchar *nic)
-{
- GtkTreeModel *model;
- GtkTreeIter iter;
-
- g_return_if_fail (netinfo != NULL);
-
- if (nic == NULL)
- return;
-
- model = gtk_combo_box_get_model (GTK_COMBO_BOX (netinfo->combo));
- if (!gtk_tree_model_get_iter_first (model, &iter)) {
- g_warning ("No network devices found.");
- return;
- }
-
- do {
- char *text = NULL;
-
- gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, 2, &text, -1);
- if (!text)
- continue;
-
- if (strcmp (text, nic) == 0) {
- gtk_combo_box_set_active_iter (GTK_COMBO_BOX (netinfo->combo), &iter);
- return;
- }
- } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (model), &iter));
-}
-
-gchar *
-info_get_nic (Netinfo * netinfo)
-{
- GtkTreeModel *model;
- GtkTreeIter iter;
- gchar *nic = NULL;
-
- g_return_val_if_fail (netinfo != NULL, NULL);
-
- model = gtk_combo_box_get_model (GTK_COMBO_BOX (netinfo->combo));
-
- if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (netinfo->combo), &iter))
- gtk_tree_model_get (model, &iter, 2, &nic, -1);
- else {
- g_warning ("No network devices found.");
- return NULL;
- }
-
- return nic;
-}
-
-static void
-info_get_interface_from_dev_name (const gchar *dev_name, gchar **iface, GdkPixbuf **pixbuf)
-{
- gint i;
- gchar *path;
-
- for (i = 0; info_iface_desc[i].name; i++)
- if (strstr (dev_name, info_iface_desc[i].prefix) == dev_name) {
- (*iface) = g_strdup_printf ("%s (%s)", _(info_iface_desc[i].name), dev_name);
- if (info_iface_desc[i].pixbuf == NULL) {
- path = g_build_filename (PIXMAPS_DIR, info_iface_desc[i].icon, NULL);
- info_iface_desc[i].pixbuf = gdk_pixbuf_new_from_file (path, NULL);
- g_free (path);
- }
- (*pixbuf) = info_iface_desc[i].pixbuf;
- return;
- }
-}
-
-void
-info_load_iface (Netinfo *info)
-{
- GtkTreeModel *model;
- GtkTreeIter iter;
- GtkCellRenderer *renderer;
- GList *items = NULL;
- GList *p;
- GdkPixbuf *pixbuf = NULL;
- gchar *iface = NULL;
- gchar *text;
-
- items = info_get_interfaces (info);
- p = items;
- model = gtk_combo_box_get_model (GTK_COMBO_BOX (info->combo));
-
- if (!items) {
- iface = g_strdup_printf ("<i>%s</i>", _("Network Devices Not Found"));
-
- gtk_list_store_append (GTK_LIST_STORE (model), &iter);
- gtk_list_store_set (GTK_LIST_STORE (model), &iter,
- 0, NULL,
- 1, iface,
- 2, (gpointer) NULL,
- -1);
-
- g_free (iface);
- } else {
- while (p) {
- text = g_strdup (p->data);
-
- info_get_interface_from_dev_name (text, &iface, &pixbuf);
-
- gtk_list_store_append (GTK_LIST_STORE (model), &iter);
- gtk_list_store_set (GTK_LIST_STORE (model), &iter,
- 0, pixbuf,
- 1, iface,
- 2, (gpointer) text,
- -1);
-
- g_free (iface);
- g_object_unref (pixbuf);
-
- p = g_list_next (p);
- }
-
- g_list_free (items);
- }
-
- gtk_cell_layout_clear (GTK_CELL_LAYOUT (info->combo));
-
- renderer = gtk_cell_renderer_pixbuf_new ();
- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (info->combo), renderer, TRUE);
- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (info->combo), renderer,
- "pixbuf", 0, NULL);
- g_object_unref (renderer);
-
- renderer = gtk_cell_renderer_text_new ();
- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (info->combo), renderer, TRUE);
- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (info->combo), renderer,
- "markup", 1, NULL);
- g_object_unref (renderer);
-
- gtk_combo_box_set_active (GTK_COMBO_BOX (info->combo), 0);
-}
-
-static gboolean
-info_nic_update_stats (gpointer data)
-{
- Netinfo *info = data;
- GtkTreeModel *model;
- gchar rx_pkt[10], rx_error[10];
- gchar tx_pkt[10], tx_error[10];
- gchar collisions[10];
- const gchar *nic;
- gchar *text_tx_bytes, *text_rx_bytes;
-
- glibtop_netload netload;
-
- g_return_val_if_fail (info != NULL, FALSE);
-
- model = gtk_combo_box_get_model (GTK_COMBO_BOX (info->combo));
- nic = info_get_nic (info);
- if (!nic)
- return FALSE;
-
- glibtop_get_netload (&netload, nic);
-
- text_rx_bytes = util_legible_bytes (netload.bytes_in);
- text_tx_bytes = util_legible_bytes (netload.bytes_out);
-
- g_sprintf (rx_pkt, "%lld", netload.packets_in);
- g_sprintf (tx_pkt, "%lld", netload.packets_out);
-
- g_sprintf (rx_error, "%lld", netload.errors_in);
- g_sprintf (tx_error, "%lld", netload.errors_out);
-
- g_sprintf (collisions, "%lld", netload.collisions);
-
- gtk_label_set_text (GTK_LABEL (info->tx_bytes), text_tx_bytes);
- gtk_label_set_text (GTK_LABEL (info->tx), tx_pkt);
- gtk_label_set_text (GTK_LABEL (info->tx_errors), tx_error);
- gtk_label_set_text (GTK_LABEL (info->rx_bytes), text_rx_bytes);
- gtk_label_set_text (GTK_LABEL (info->rx), rx_pkt);
- gtk_label_set_text (GTK_LABEL (info->rx_errors), rx_error);
- gtk_label_set_text (GTK_LABEL (info->collisions), collisions);
-
- g_free (text_tx_bytes);
- g_free (text_rx_bytes);
-
- return TRUE;
-}
-
-void
-info_nic_changed (GtkWidget *combo, gpointer data)
-{
- gchar *text = NULL;
- Netinfo *info = data;
- GtkTreeModel *model;
-
- static gint timeout_source = 0;
-
- g_return_if_fail (info != NULL);
-
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (info->list_ip_addr));
- if (model)
- gtk_list_store_clear (GTK_LIST_STORE (model));
-
- text = info_get_nic (info);
- if (!text)
- return;
-
- /* Fill the NIC configuration data */
- info_get_nic_information (text, info);
- info_nic_update_stats (info);
-
- if (timeout_source > 0) {
- g_source_remove (timeout_source);
- }
-
- timeout_source = g_timeout_add (DELAY_STATS, info_nic_update_stats, info);
-}
-
-static gint
-info_ip6_masklen (guint8 *netmask)
-{
- gint len = 0;
- guchar val;
- guchar *pnt;
-
- pnt = (guchar *) netmask;
-
- while ((*pnt == 0xff) && len < 128) {
- len += 8;
- pnt ++;
- }
-
- if (len < 128) {
- val = *pnt;
- while (val) {
- len++;
- val <<= 1;
- }
- }
-
- return len;
-}
-
-typedef struct {
- gchar *ip_addr;
- gchar *ip_prefix;
- gchar *ip_bcast;
- gchar *ip_scope;
-} InfoIpAddr;
-
-static void
-info_ip_addr_free (InfoIpAddr *ip)
-{
- g_free (ip->ip_addr);
- g_free (ip->ip_prefix);
- g_free (ip->ip_bcast);
- g_free (ip->ip_scope);
- g_free (ip);
-}
-
-static void
-info_setup_configure_button (Netinfo *info, gboolean enable)
-{
- gchar *network_tool_path;
-
- network_tool_path = util_find_program_in_path ("nm-connection-editor", NULL);
- if (!network_tool_path)
- network_tool_path = util_find_program_in_path ("network-admin", NULL);
-
- if (!network_tool_path)
- gtk_widget_hide (info->configure_button);
- else {
- gtk_widget_show (info->configure_button);
- gtk_widget_set_sensitive (info->configure_button, enable);
-
- g_free (network_tool_path);
- }
-}
-
-void
-info_get_nic_information (const gchar *nic, Netinfo *info)
-{
- GtkTreeModel *model;
- GtkTreeIter iter;
- gchar dst[INFO_ADDRSTRLEN];
- InfoIpAddr *ip;
- gint prefix;
- struct in_addr addr, subnet;
- gchar *address_string, *subnet_string;
- gchar address6_string[INET6_ADDRSTRLEN];
- glibtop_netload netload;
-#ifdef __linux__
- mii_data_result data;
-#endif
-
- gtk_label_set_text (GTK_LABEL (info->hw_address), NOT_AVAILABLE);
- gtk_label_set_text (GTK_LABEL (info->mtu), NOT_AVAILABLE);
- gtk_label_set_text (GTK_LABEL (info->state), NOT_AVAILABLE);
- gtk_label_set_text (GTK_LABEL (info->multicast), NOT_AVAILABLE);
- gtk_label_set_text (GTK_LABEL (info->link_speed), NOT_AVAILABLE);
-
- glibtop_get_netload (&netload, nic);
-
- /* IPv6 */
- /* FIXME: It shows only one IPv6 address. Bug #563768 */
- inet_ntop (AF_INET6, netload.address6, address6_string, INET6_ADDRSTRLEN);
- prefix = info_ip6_masklen (netload.prefix6);
-
- ip = g_new0 (InfoIpAddr, 1);
- ip->ip_addr = g_strdup (address6_string);
- ip->ip_prefix = g_strdup_printf ("%d", prefix);
- ip->ip_bcast = g_strdup ("");
-
- switch (netload.scope6) {
- case GLIBTOP_IF_IN6_SCOPE_LINK:
- ip->ip_scope = g_strdup ("Link");
- break;
- case GLIBTOP_IF_IN6_SCOPE_SITE:
- ip->ip_scope = g_strdup ("Site");
- break;
- case GLIBTOP_IF_IN6_SCOPE_GLOBAL:
- ip->ip_scope = g_strdup ("Global");
- break;
- case GLIBTOP_IF_IN6_SCOPE_HOST:
- ip->ip_scope = g_strdup ("Host");
- break;
- case GLIBTOP_IF_IN6_SCOPE_UNKNOWN:
- ip->ip_scope = g_strdup (_("Unknown"));
- break;
- default:
- ip->ip_scope = g_strdup (_("Unknown"));
- break;
- }
-
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (info->list_ip_addr));
-
- gtk_list_store_append (GTK_LIST_STORE (model), &iter);
- gtk_list_store_set (GTK_LIST_STORE (model), &iter,
- 0, "IPv6",
- 1, ip->ip_addr,
- 2, ip->ip_prefix,
- 3, ip->ip_bcast,
- 4, ip->ip_scope,
- -1);
- info_ip_addr_free (ip);
-
- /* IPv4 */
- addr.s_addr = netload.address;
- subnet.s_addr = netload.subnet;
-
- address_string = g_strdup (inet_ntoa (addr));
- subnet_string = g_strdup (inet_ntoa (subnet));
-
- ip = g_new0 (InfoIpAddr, 1);
- ip->ip_addr = g_strdup (address_string);
- ip->ip_prefix = g_strdup (subnet_string);
- /* FIXME: Get the broadcast address: Bug #563765 */
- ip->ip_bcast = g_strdup ("");
-
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (info->list_ip_addr));
-
- gtk_list_store_append (GTK_LIST_STORE (model), &iter);
- gtk_list_store_set (GTK_LIST_STORE (model), &iter,
- 0, "IPv4",
- 1, ip->ip_addr,
- 2, ip->ip_prefix,
- 3, ip->ip_bcast,
- 4, "",
- -1);
-
- g_free (address_string);
- g_free (subnet_string);
- info_ip_addr_free (ip);
-
-
- /* Get general information about the interface */
-
- /* Get the Hardware Address */
- if (netload.flags & (1L << GLIBTOP_NETLOAD_HWADDRESS)) {
- g_sprintf (dst, "%02x:%02x:%02x:%02x:%02x:%02x",
- (int) ((guchar *) &netload.hwaddress)[0],
- (int) ((guchar *) &netload.hwaddress)[1],
- (int) ((guchar *) &netload.hwaddress)[2],
- (int) ((guchar *) &netload.hwaddress)[3],
- (int) ((guchar *) &netload.hwaddress)[4],
- (int) ((guchar *) &netload.hwaddress)[5]);
- } else {
- g_sprintf (dst, NOT_AVAILABLE);
- }
- gtk_label_set_text (GTK_LABEL (info->hw_address), dst);
-
- /* Get the interface's Maximum Transfer Unit */
- g_sprintf (dst, "%d", netload.mtu);
- gtk_label_set_text (GTK_LABEL (info->mtu), dst);
- bzero (dst, strlen(dst));
-
-
- /* Get Flags to determine other properties */
-
- /* Is the interface up? */
- if (netload.if_flags & (1L << GLIBTOP_IF_FLAGS_UP)) {
- gtk_label_set_text (GTK_LABEL (info->state), _("Active"));
- } else {
- gtk_label_set_text (GTK_LABEL (info->state), _("Inactive"));
- }
-
- /* Is this a loopback device? */
- if (netload.if_flags & (1L << GLIBTOP_IF_FLAGS_LOOPBACK)) {
- gtk_label_set_text (GTK_LABEL (info->hw_address), _("Loopback"));
- ip->ip_bcast = g_strdup ("");
- info_setup_configure_button (info, FALSE);
- } else {
- info_setup_configure_button (info, TRUE);
- }
-
- /* Does this interface supports multicast? */
- if (netload.if_flags & (1L << GLIBTOP_IF_FLAGS_MULTICAST)) {
- gtk_label_set_text (GTK_LABEL (info->multicast), _("Enabled"));
- } else {
- gtk_label_set_text (GTK_LABEL (info->multicast), _("Disabled"));
- }
-
- /* Get the Point-To-Point address if any */
- /* FIXME: Bug #563767 */
-
- /* Get the link negotiation speed. Only available on Linux
- * systems, and lately only for with super user privileges
- * See Bug #387198 */
-#ifdef __linux__
- data = mii_get_basic (nic);
- if (data.has_data) {
- gtk_label_set_text (GTK_LABEL (info->link_speed), data.media);
- }
-#else
- gtk_label_set_text (GTK_LABEL (info->link_speed), NOT_AVAILABLE);
-#endif
-}
-
-static gint *
-compare (gconstpointer a, gconstpointer b)
-{
- return (GINT_TO_POINTER (strcmp (a, b)));
-}
-
-static GList *
-info_get_interfaces (Netinfo *info)
-{
- GList *items = NULL;
- glibtop_netlist netlist;
- gchar **devices;
- gchar *iface;
- gint i;
-
- devices = glibtop_get_netlist(&netlist);
-
- for(i = 0; i < netlist.number; ++i) {
- iface = g_strdup (devices[i]);
- if (g_list_find_custom (items, iface,
- (GCompareFunc) compare) == NULL) {
- items = g_list_append (items, iface);
- }
- }
-
- g_strfreev(devices);
-
- return items;
-}
-
-/* Copy on clipboard */
-void
-info_copy_to_clipboard (Netinfo * netinfo, gpointer user_data)
-{
- GString *result;
- const gchar *nic;
- const gchar *hw_address;
- const gchar *multicast;
- const gchar *link_speed;
- const gchar *state;
- const gchar *mtu;
- const gchar *tx;
- const gchar *tx_errors;
- const gchar *rx;
- const gchar *rx_errors;
- const gchar *collisions;
-
- g_return_if_fail (netinfo != NULL);
-
- /* The info output in text format:
- Bytes received, Address Source, Number of Sequence,
- Round Trip Time (Time), Units of Time.
- It's a tabular output, and these belongs to the column titles */
- result = g_string_new ("");
-
- nic = info_get_nic (netinfo);
-
- hw_address = gtk_label_get_text (GTK_LABEL (netinfo->hw_address));
- multicast = gtk_label_get_text (GTK_LABEL (netinfo->multicast));
- mtu = gtk_label_get_text (GTK_LABEL (netinfo->mtu));
- link_speed = gtk_label_get_text (GTK_LABEL (netinfo->link_speed));
- state = gtk_label_get_text (GTK_LABEL (netinfo->state));
-
- tx = gtk_label_get_text (GTK_LABEL (netinfo->tx));
- rx = gtk_label_get_text (GTK_LABEL (netinfo->rx));
- tx_errors = gtk_label_get_text (GTK_LABEL (netinfo->tx_errors));
- rx_errors = gtk_label_get_text (GTK_LABEL (netinfo->rx_errors));
- collisions = gtk_label_get_text (GTK_LABEL (netinfo->collisions));
-
- /* The info output in a text format (to copy on clipboard) */
- g_string_append_printf (result, _("Network device:\t%s\n"), nic);
- g_string_append_printf (result, _("Hardware address:\t%s\n"), hw_address);
- g_string_append_printf (result, _("Multicast:\t%s\n"), multicast);
- g_string_append_printf (result, _("MTU:\t%s\n"), mtu);
- g_string_append_printf (result, _("Link speed:\t%s\n"), link_speed);
- g_string_append_printf (result, _("State:\t%s\n"), state);
-
- g_string_append_printf (result, _("Transmitted packets:\t%s\n"), tx);
- g_string_append_printf (result, _("Transmission errors:\t%s\n"), tx_errors);
- g_string_append_printf (result, _("Received packets:\t%s\n"), rx);
- g_string_append_printf (result, _("Reception errors:\t%s\n"), rx_errors);
- g_string_append_printf (result, _("Collisions:\t%s\n"), collisions);
-
-
- gtk_clipboard_set_text (gtk_clipboard_get (GDK_NONE), result->str,
- result->len);
-
- g_string_free (result, TRUE);
-}
diff -pruN 3.0.0-2/.pc/03_use_tracepath.patch/src/traceroute.c 3.0.1-0ubuntu1/.pc/03_use_tracepath.patch/src/traceroute.c
--- 3.0.0-2/.pc/03_use_tracepath.patch/src/traceroute.c 1970-01-01 00:00:00.000000000 +0000
+++ 3.0.1-0ubuntu1/.pc/03_use_tracepath.patch/src/traceroute.c 2012-01-03 09:10:16.000000000 +0000
@@ -0,0 +1,343 @@
+/* -*- mode:C; indent-tabs-mode:t; tab-width:8; c-basic-offset:8; -*- */
+/* gnome-netinfo - A GUI Interface for network utilities
+ * Copyright (C) 2002, 2003 by German Poo-Caaman~o
+ *
+ * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <glib/gprintf.h>
+
+#include "traceroute.h"
+#include "utils.h"
+
+static gint strip_line (gchar * line, traceroute_data * data);
+static GtkTreeModel *traceroute_create_model (GtkTreeView *widget);
+
+void
+traceroute_stop (Netinfo * netinfo)
+{
+ g_return_if_fail (netinfo != NULL);
+
+ netinfo_stop_process_command (netinfo);
+}
+
+void
+traceroute_do (Netinfo * netinfo)
+{
+ const gchar *host = NULL;
+ gchar *command = NULL;
+ gchar *program = NULL;
+ gchar *program_name = NULL;
+ GtkTreeModel *model;
+ GtkWidget *parent;
+
+ g_return_if_fail (netinfo != NULL);
+
+ /* Because of the delay, we can't check twice for a hostname/IP.
+ * It was made before this function was called. Anyway, we
+ * check at least if we have a text as hostname */
+ if (netinfo_validate_domain (netinfo) == FALSE) {
+ netinfo_stop_process_command (netinfo);
+ return;
+ }
+
+ host = netinfo_get_host (netinfo);
+
+ if (netinfo->stbar_text)
+ g_free (netinfo->stbar_text);
+ netinfo->stbar_text = g_strdup_printf (_("Tracing route to %s"), host);
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (netinfo->output));
+ if (GTK_IS_LIST_STORE (model)) {
+ gtk_list_store_clear (GTK_LIST_STORE (model));
+ }
+
+ parent = gtk_widget_get_toplevel (netinfo->output);
+
+ switch (netinfo_get_ip_version (netinfo))
+ {
+ case IPV4:
+ program = util_find_program_in_path ("tcptraceroute", NULL);
+#ifdef DEBUG
+ g_print ("tcptraceroute: %s\n", program);
+#endif /* DEBUG */
+ if (program != NULL) {
+ program_name = g_strdup ("tcptraceroute");
+ } else {
+ program = util_find_program_dialog ("traceroute", parent);
+ program_name = g_strdup ("traceroute");
+ }
+ break;
+ case IPV6:
+ program = util_find_program_in_path ("traceroute6", NULL);
+ program_name = g_strdup ("traceroute6");
+ break;
+ default:
+ program = NULL;
+ break;
+ }
+
+ if (program != NULL) {
+ command =
+ g_strdup_printf ("%s %s %s %s", program, program_name,
+ TCPTRACEROUTE_OPTIONS, host);
+
+ netinfo->command_line = g_strsplit (command, " ", -1);
+
+ netinfo_process_command (netinfo);
+
+ g_strfreev (netinfo->command_line);
+ g_free (command);
+ g_free (program);
+ g_free (program_name);
+ }
+}
+
+/* Process each line from ping command */
+void
+traceroute_foreach (Netinfo * netinfo, gchar * line, gssize len,
+ gpointer user_data)
+{
+ gchar *text_utf8;
+ gsize bytes_written;
+ GtkTextBuffer *buffer = NULL;
+ GtkTextIter iter;
+
+ g_return_if_fail (netinfo != NULL);
+ g_return_if_fail (line != NULL);
+
+ buffer =
+ gtk_text_view_get_buffer (GTK_TEXT_VIEW (netinfo->output));
+ gtk_text_buffer_get_end_iter (buffer, &iter);
+
+ if (len > 0) {
+ text_utf8 = g_locale_to_utf8 (line, len,
+ NULL, &bytes_written, NULL);
+
+ gtk_text_buffer_insert
+ (GTK_TEXT_BUFFER (buffer), &iter, text_utf8,
+ bytes_written);
+ g_free (text_utf8);
+ }
+}
+
+void
+traceroute_foreach_with_tree (Netinfo * netinfo, gchar * line, gint len,
+ gpointer user_data)
+{
+ GtkTreeIter iter;
+ GList *columns;
+ GtkTreePath *path;
+ GtkTreeModel *model;
+ GtkTreeView *widget;
+ gint count;
+ traceroute_data data;
+
+ g_return_if_fail (netinfo != NULL);
+ g_return_if_fail (line != NULL);
+
+ widget = (GTK_TREE_VIEW (netinfo->output));
+
+ if (len > 0) { /* there are data to show */
+ /* count = traceroute_strip_line (line, &data); */
+
+ count = strip_line (line, &data);
+
+ if (count == TRACE_NUM_ARGS) {
+
+ gtk_tree_view_set_rules_hint (GTK_TREE_VIEW
+ (widget), TRUE);
+ columns =
+ gtk_tree_view_get_columns (GTK_TREE_VIEW
+ (widget));
+
+ if (g_list_length (columns) == 0) {
+
+ model = traceroute_create_model (widget);
+ gtk_tree_view_set_model (GTK_TREE_VIEW
+ (widget), model);
+ }
+
+ g_list_free (columns);
+
+ model =
+ gtk_tree_view_get_model (GTK_TREE_VIEW
+ (widget));
+
+ gtk_tree_view_get_cursor (GTK_TREE_VIEW (widget),
+ &path, NULL);
+
+ gtk_list_store_append (GTK_LIST_STORE
+ (model), &iter);
+
+ gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+ TRACE_HOP, data.hop_count,
+ TRACE_HOSTNAME, data.hostname,
+ TRACE_IP, data.ip,
+ TRACE_RTT1, data.rtt1,
+ TRACE_RTT2, data.rtt2,
+/* TRACE_RTT3, data.rtt3,*/ -1);
+
+ gtk_tree_view_set_model (GTK_TREE_VIEW (widget),
+ model);
+
+ if (path) {
+ gtk_tree_view_set_cursor (
+ GTK_TREE_VIEW (widget),
+ path, NULL, FALSE);
+ gtk_tree_path_free (path);
+ }
+ }
+ }
+ while (gtk_events_pending ()) {
+ gtk_main_iteration_do (FALSE);
+ }
+}
+
+static gint
+strip_line (gchar * line, traceroute_data * data)
+{
+ gint count;
+
+ line = g_strdelimit (line, "()", ' ');
+
+ count = sscanf (line, TRACE_FORMAT,
+ &(data)->hop_count, data->hostname, data->ip,
+ data->rtt1, data->rtt2/*, data->rtt3*/);
+
+ if (count == TRACE_NUM_ARGS) {
+ return count;
+ }
+
+ if (count == TRACE_NUM_ERR) {
+ g_sprintf (data->rtt1, "*");
+ g_sprintf (data->rtt2, "*");
+ return TRACE_NUM_ARGS;
+ }
+ /* The last line is different, because it has a
+ extra [open] or [close] string. That string it
+ does not matter to us
+ */
+
+ count = sscanf (line, TRACE_FORMAT_OPEN,
+ &(data)->hop_count, data->hostname, data->ip,
+ data->rtt1, data->rtt2/*, data->rtt3*/);
+
+ if (count == TRACE_NUM_ARGS) {
+ return count;
+ } else {
+ count = sscanf (line, TRACE_FORMAT_CLOSE,
+ &(data)->hop_count, data->hostname,
+ data->ip, data->rtt1, data->rtt2 /*,
+ data->rtt3*/);
+ }
+
+ return count;
+}
+
+static GtkTreeModel *
+traceroute_create_model (GtkTreeView *widget)
+{
+ GtkCellRenderer *renderer = NULL;
+ static GtkTreeViewColumn *column;
+ GtkTreeModel *model;
+
+ /*FIXME: Set correctly the align for each renderer */
+
+ renderer = gtk_cell_renderer_text_new ();
+ /* Number of sequence of each hop in a traceroute output */
+ column =
+ gtk_tree_view_column_new_with_attributes
+ (_("Hop"), renderer, "text", TRACE_HOP, NULL);
+ g_object_set (G_OBJECT (renderer), "xalign", 1.0, NULL);
+ gtk_tree_view_append_column (widget, column);
+
+ renderer = gtk_cell_renderer_text_new ();
+ /* Hostname of target we are tracing the route */
+ column =
+ gtk_tree_view_column_new_with_attributes
+ (_("Hostname"), renderer, "text", TRACE_HOSTNAME, NULL);
+ gtk_tree_view_column_set_alignment (column, 0.5);
+ gtk_tree_view_append_column (widget, column);
+
+ renderer = gtk_cell_renderer_text_new ();
+ /* IP address of the hostname we are tracing the route */
+ column =
+ gtk_tree_view_column_new_with_attributes
+ (_("IP"), renderer, "text", TRACE_IP, NULL);
+ g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
+ gtk_tree_view_column_set_alignment (column, 0.5);
+ gtk_tree_view_append_column (widget, column);
+
+
+ renderer = gtk_cell_renderer_text_new ();
+ /* Time elapsed between a packets was sent and
+ when was received its reply (1st sample) */
+ column =
+ gtk_tree_view_column_new_with_attributes
+ (_("Time 1"), renderer, "text", TRACE_RTT1, NULL);
+ g_object_set (G_OBJECT (renderer), "xalign", 1.0, NULL);
+ gtk_tree_view_append_column (widget, column);
+
+
+ renderer = gtk_cell_renderer_text_new ();
+ /* Time elapsed between a packets was sent and
+ when was received its reply (2nd sample) */
+ column =
+ gtk_tree_view_column_new_with_attributes
+ (_("Time 2"), renderer, "text", TRACE_RTT2, NULL);
+ g_object_set (G_OBJECT (renderer), "xalign", 1.0, NULL);
+ gtk_tree_view_append_column (widget, column);
+
+ model = GTK_TREE_MODEL (gtk_list_store_new
+ (TRACE_NUM_COLUMNS,
+ G_TYPE_INT,
+ G_TYPE_STRING,
+ G_TYPE_STRING,
+ G_TYPE_STRING,
+ G_TYPE_STRING));
+
+ return model;
+}
+
+void
+traceroute_copy_to_clipboard (Netinfo * netinfo, gpointer user_data)
+{
+ GString *result, *content;
+
+ g_return_if_fail (netinfo != NULL);
+
+ /* The traceroute output in text format:
+ Hop count, Hostname, IP, Round Trip Time 1 (Time1),
+ Round Trip Time 2 (Time2),
+ It's a tabular output, and these belongs to the column titles */
+ result = g_string_new (_("Hop\tHostname\tIP\tTime 1\tTime 2\n"));
+
+ content = util_tree_model_to_string (GTK_TREE_VIEW (netinfo->output));
+
+ g_string_append_printf (result, "%s", content->str);
+
+ gtk_clipboard_set_text (gtk_clipboard_get (GDK_NONE), result->str,
+ result->len);
+
+ g_string_free (content, TRUE);
+ g_string_free (result, TRUE);
+}
diff -pruN 3.0.0-2/.pc/03_use_tracepath.patch/src/traceroute.h 3.0.1-0ubuntu1/.pc/03_use_tracepath.patch/src/traceroute.h
--- 3.0.0-2/.pc/03_use_tracepath.patch/src/traceroute.h 1970-01-01 00:00:00.000000000 +0000
+++ 3.0.1-0ubuntu1/.pc/03_use_tracepath.patch/src/traceroute.h 2012-01-03 09:10:16.000000000 +0000
@@ -0,0 +1,66 @@
+/* gnome-netinfo - A GUI Interface for network utilities
+ * Copyright (C) 2002, 2003 by German Poo-Caaman~o
+ *
+ * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <glib.h>
+
+#include "nettool.h"
+
+#define TRACE_FORMAT "%d %s %s %s ms %s ms"
+#define TRACE_FORMAT_CLOSE "%d %s %s [closed] %s ms %s ms"
+#define TRACE_FORMAT_OPEN "%d %s %s [open] %s ms %s ms"
+#define TRACE_SELECT_DEVICE "Selected device %s address %s port %d for outgoing packets"
+#define TRACE_TRACE_PATH "Tracing the path to %s (146.83.195.14) on TCP port 80 %d hops max"
+#define TRACE_NUM_ARGS 5
+#define TRACE_NUM_ERR 3
+
+/* Try 40 hops maximum and send only 1 packet */
+#define TCPTRACEROUTE_OPTIONS "-q 2 -m 40"
+
+typedef struct _traceroute_data traceroute_data;
+typedef struct _trace_source_data trace_source_data;
+
+struct _traceroute_data {
+ gint hop_count;
+ gchar hostname[128];
+ gchar ip[128];
+ gchar rtt1[128];
+ gchar rtt2[128];
+};
+
+struct _trace_source_data {
+ gchar device[64];
+ gchar ip_src[128];
+ gint port;
+ gchar ip_dst[128];
+ gint hops;
+};
+
+enum {
+ TRACE_HOP,
+ TRACE_HOSTNAME,
+ TRACE_IP,
+ TRACE_RTT1,
+ TRACE_RTT2,
+ TRACE_NUM_COLUMNS
+};
+
+void traceroute_do (Netinfo *netinfo);
+void traceroute_stop (Netinfo *netinfo);
+void traceroute_foreach (Netinfo * netinfo, gchar * line, gssize len, gpointer user_data);
+void traceroute_foreach_with_tree (Netinfo * netinfo, gchar * line, gint len, gpointer user_data);
+void traceroute_copy_to_clipboard (Netinfo * netinfo, gpointer user_data);
diff -pruN 3.0.0-2/.pc/04_menu_change.patch/data/gnome-nettool.desktop.in.in 3.0.1-0ubuntu1/.pc/04_menu_change.patch/data/gnome-nettool.desktop.in.in
--- 3.0.0-2/.pc/04_menu_change.patch/data/gnome-nettool.desktop.in.in 1970-01-01 00:00:00.000000000 +0000
+++ 3.0.1-0ubuntu1/.pc/04_menu_change.patch/data/gnome-nettool.desktop.in.in 2012-01-03 09:10:16.000000000 +0000
@@ -0,0 +1,13 @@
+[Desktop Entry]
+_Name=Network Tools
+_Comment=View information about your network
+Exec=gnome-nettool
+Icon=gnome-nettool
+Terminal=false
+Type=Application
+Categories=System;Utility;GNOME;GTK;
+StartupNotify=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-nettool
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version=@PACKAGE_VERSION@
diff -pruN 3.0.0-2/.pc/applied-patches 3.0.1-0ubuntu1/.pc/applied-patches
--- 3.0.0-2/.pc/applied-patches 2012-02-16 05:03:13.000000000 +0000
+++ 3.0.1-0ubuntu1/.pc/applied-patches 2012-02-16 05:03:12.000000000 +0000
@@ -1,3 +1,4 @@
-01_ping_icmp_req.patch
+02_lpi.patch
02_fix_ui.patch
-03_fix_ifaces.patch
+03_use_tracepath.patch
+04_menu_change.patch
diff -pruN 3.0.0-2/pixmaps/icons/16x16/apps/Makefile.in 3.0.1-0ubuntu1/pixmaps/icons/16x16/apps/Makefile.in
--- 3.0.0-2/pixmaps/icons/16x16/apps/Makefile.in 2011-04-04 08:31:34.000000000 +0000
+++ 3.0.1-0ubuntu1/pixmaps/icons/16x16/apps/Makefile.in 2012-01-03 09:26:47.000000000 +0000
@@ -101,6 +101,7 @@ DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -138,6 +139,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
@@ -180,6 +182,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -213,7 +216,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff -pruN 3.0.0-2/pixmaps/icons/16x16/Makefile.in 3.0.1-0ubuntu1/pixmaps/icons/16x16/Makefile.in
--- 3.0.0-2/pixmaps/icons/16x16/Makefile.in 2011-04-04 08:31:34.000000000 +0000
+++ 3.0.1-0ubuntu1/pixmaps/icons/16x16/Makefile.in 2012-01-03 09:26:47.000000000 +0000
@@ -117,6 +117,7 @@ DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -154,6 +155,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
@@ -196,6 +198,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -229,7 +232,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff -pruN 3.0.0-2/pixmaps/icons/22x22/apps/Makefile.in 3.0.1-0ubuntu1/pixmaps/icons/22x22/apps/Makefile.in
--- 3.0.0-2/pixmaps/icons/22x22/apps/Makefile.in 2011-04-04 08:31:34.000000000 +0000
+++ 3.0.1-0ubuntu1/pixmaps/icons/22x22/apps/Makefile.in 2012-01-03 09:26:47.000000000 +0000
@@ -101,6 +101,7 @@ DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -138,6 +139,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
@@ -180,6 +182,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -213,7 +216,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff -pruN 3.0.0-2/pixmaps/icons/22x22/Makefile.in 3.0.1-0ubuntu1/pixmaps/icons/22x22/Makefile.in
--- 3.0.0-2/pixmaps/icons/22x22/Makefile.in 2011-04-04 08:31:34.000000000 +0000
+++ 3.0.1-0ubuntu1/pixmaps/icons/22x22/Makefile.in 2012-01-03 09:26:47.000000000 +0000
@@ -117,6 +117,7 @@ DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -154,6 +155,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
@@ -196,6 +198,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -229,7 +232,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff -pruN 3.0.0-2/pixmaps/icons/24x24/apps/Makefile.in 3.0.1-0ubuntu1/pixmaps/icons/24x24/apps/Makefile.in
--- 3.0.0-2/pixmaps/icons/24x24/apps/Makefile.in 2011-04-04 08:31:34.000000000 +0000
+++ 3.0.1-0ubuntu1/pixmaps/icons/24x24/apps/Makefile.in 2012-01-03 09:26:47.000000000 +0000
@@ -101,6 +101,7 @@ DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -138,6 +139,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
@@ -180,6 +182,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -213,7 +216,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff -pruN 3.0.0-2/pixmaps/icons/24x24/Makefile.in 3.0.1-0ubuntu1/pixmaps/icons/24x24/Makefile.in
--- 3.0.0-2/pixmaps/icons/24x24/Makefile.in 2011-04-04 08:31:34.000000000 +0000
+++ 3.0.1-0ubuntu1/pixmaps/icons/24x24/Makefile.in 2012-01-03 09:26:47.000000000 +0000
@@ -117,6 +117,7 @@ DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -154,6 +155,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
@@ -196,6 +198,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -229,7 +232,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff -pruN 3.0.0-2/pixmaps/icons/32x32/apps/Makefile.in 3.0.1-0ubuntu1/pixmaps/icons/32x32/apps/Makefile.in
--- 3.0.0-2/pixmaps/icons/32x32/apps/Makefile.in 2011-04-04 08:31:34.000000000 +0000
+++ 3.0.1-0ubuntu1/pixmaps/icons/32x32/apps/Makefile.in 2012-01-03 09:26:48.000000000 +0000
@@ -101,6 +101,7 @@ DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -138,6 +139,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
@@ -180,6 +182,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -213,7 +216,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff -pruN 3.0.0-2/pixmaps/icons/32x32/Makefile.in 3.0.1-0ubuntu1/pixmaps/icons/32x32/Makefile.in
--- 3.0.0-2/pixmaps/icons/32x32/Makefile.in 2011-04-04 08:31:34.000000000 +0000
+++ 3.0.1-0ubuntu1/pixmaps/icons/32x32/Makefile.in 2012-01-03 09:26:47.000000000 +0000
@@ -117,6 +117,7 @@ DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -154,6 +155,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
@@ -196,6 +198,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -229,7 +232,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff -pruN 3.0.0-2/pixmaps/icons/Makefile.in 3.0.1-0ubuntu1/pixmaps/icons/Makefile.in
--- 3.0.0-2/pixmaps/icons/Makefile.in 2011-04-04 08:31:34.000000000 +0000
+++ 3.0.1-0ubuntu1/pixmaps/icons/Makefile.in 2012-01-03 09:26:48.000000000 +0000
@@ -117,6 +117,7 @@ DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -154,6 +155,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
@@ -196,6 +198,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -229,7 +232,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff -pruN 3.0.0-2/pixmaps/icons/scalable/apps/Makefile.in 3.0.1-0ubuntu1/pixmaps/icons/scalable/apps/Makefile.in
--- 3.0.0-2/pixmaps/icons/scalable/apps/Makefile.in 2011-04-04 08:31:35.000000000 +0000
+++ 3.0.1-0ubuntu1/pixmaps/icons/scalable/apps/Makefile.in 2012-01-03 09:26:48.000000000 +0000
@@ -101,6 +101,7 @@ DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -138,6 +139,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
@@ -180,6 +182,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -213,7 +216,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff -pruN 3.0.0-2/pixmaps/icons/scalable/Makefile.in 3.0.1-0ubuntu1/pixmaps/icons/scalable/Makefile.in
--- 3.0.0-2/pixmaps/icons/scalable/Makefile.in 2011-04-04 08:31:35.000000000 +0000
+++ 3.0.1-0ubuntu1/pixmaps/icons/scalable/Makefile.in 2012-01-03 09:26:48.000000000 +0000
@@ -117,6 +117,7 @@ DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -154,6 +155,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
@@ -196,6 +198,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -229,7 +232,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff -pruN 3.0.0-2/pixmaps/Makefile.in 3.0.1-0ubuntu1/pixmaps/Makefile.in
--- 3.0.0-2/pixmaps/Makefile.in 2011-04-04 08:31:34.000000000 +0000
+++ 3.0.1-0ubuntu1/pixmaps/Makefile.in 2012-01-03 09:26:47.000000000 +0000
@@ -141,6 +141,7 @@ DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -178,6 +179,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
@@ -220,6 +222,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -253,7 +256,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff -pruN 3.0.0-2/po/as.po 3.0.1-0ubuntu1/po/as.po
--- 3.0.0-2/po/as.po 2011-04-04 08:21:10.000000000 +0000
+++ 3.0.1-0ubuntu1/po/as.po 2011-12-31 23:54:24.000000000 +0000
@@ -8,9 +8,9 @@
msgid ""
msgstr ""
"Project-Id-Version: as\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.";
-"cgi?product=gnome-nettool&component=general\n"
-"POT-Creation-Date: 2010-11-10 22:40+0000\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
+"nettool&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-07-13 08:50+0000\n"
"PO-Revision-Date: 2011-03-14 15:01+0000\n"
"Last-Translator: Nilamdyuti Goswami <ngoswami redhat com>\n"
"Language-Team: Assamese <kde-i18n-doc kde org>\n"
@@ -20,44 +20,44 @@ msgstr ""
"X-Generator: Lokalize 1.0\n"
"Plural-Forms: nplurals=2; plural=(n!=1)\n"
-#: ../src/callbacks.c:323
+#: ../src/callbacks.c:332
msgid "translator-credits"
-msgstr "�মিতা��ষ ফ��ন (aphukan fedoraproject org)"
+msgstr "�মিতা��ষ ফ��ন (aphukan fedoraproject org), ন�লমদ�য�তি ��স�বাম� (ngoswami redhat com)"
#. Translators: %s is the name of the copyright holder
-#: ../src/callbacks.c:330
+#: ../src/callbacks.c:339
#, c-format
msgid "Copyright © 2003-2008 %s"
-msgstr "Copyright © 2003-2008 %s"
+msgstr "স�বত�বাধি�াৰ © ২০০৩-২০০৮ %s"
#. Dear translator: This is the name of the application
-#: ../src/callbacks.c:334 ../src/callbacks.c:335
+#: ../src/callbacks.c:343 ../src/callbacks.c:344
#: ../data/gnome-nettool.desktop.in.in.h:1
msgid "Network Tools"
-msgstr "ন��ৱৰ�� স���ৰান�ত ��ল"
+msgstr "ন��ৱাৰ�� স���লি"
-#: ../src/callbacks.c:337
+#: ../src/callbacks.c:346
msgid "Graphical user interface for common network utilities"
-msgstr "সাধাৰণ ন��ৱৰ�� ���িলি�িৰ বাব� �িত�ৰা���িত ব�যৱহাৰ�ৰ��তা স�য��মাধ�যম"
+msgstr "সাধাৰণ ন��ৱাৰ�� স���লিসম�হৰ বাব� ��ৰাফ�� ব�যৱহাৰ�াৰ� �ন�ত�প�ষ��"
-#: ../src/callbacks.c:449 ../src/main.c:142 ../src/nettool.c:483
+#: ../src/callbacks.c:458 ../src/main.c:142 ../src/nettool.c:488
msgid "Idle"
-msgstr "�ৰ�মবিহ�ন"
+msgstr "�লস"
#. Dear Translator: This is the Window Title. 'Network Tools' is the
#. * name of the application
-#: ../src/callbacks.c:454
+#: ../src/callbacks.c:463
#, c-format
msgid "%s - Network Tools"
-msgstr "%s - Network Tools"
+msgstr "%s - ন��ৱাৰ�� স���লিসম�হ"
-#: ../src/callbacks.c:478
+#: ../src/callbacks.c:487
msgid "Unable to open help file"
-msgstr "সহা�ি�াৰ নথিপত�ৰ ��লিবল� ব�যৰ�থ"
+msgstr "সহা�ৰ নথিপত�ৰ ��লিবল� ব�যৰ�থ"
#: ../data/gnome-nettool.desktop.in.in.h:2
msgid "View information about your network"
-msgstr "à¦à¦¿à¦? নà§?à¦?ৱৰà§?à¦?"
+msgstr "�প�নাৰ ন��ৱাৰ��ৰ বিষ�� তথ�য দৰ�শন �ৰ�"
#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:1
msgid "A list of domains previously used"
@@ -65,7 +65,7 @@ msgstr "পà§?ৰà§?বৱৰà§?তà§? à
#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:2
msgid "A list of hostnames previously used"
-msgstr "প�ৰ�বৱৰ�ত� ব�যৱহাৰ �ৰা হস��ন�মসম�হৰ তালি�া"
+msgstr "প�ৰ�বৱৰ�ত� ব�যৱহাৰ �ৰা হস��নামসম�হৰ তালি�া"
#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:3
msgid "A list of usernames previously used"
@@ -77,7 +77,7 @@ msgstr "à¦?তিহাসিà¦?à¦à¦¾à§
#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:5
msgid "Historically used hostnames"
-msgstr "à¦?তিহাসিà¦?à¦à¦¾à§±à§? বà§?যৱহাৰ à¦?ৰা হসà§?à¦?নà§?মসমà§?হ"
+msgstr "à¦?তিহাসিà¦?à¦à¦¾à§±à§? বà§?যৱহাৰ à¦?ৰা হসà§?à¦?নামসমà§?হ"
#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:6
msgid "Historically used usernames"
@@ -98,27 +98,27 @@ msgstr "০.০"
#: ../data/gnome-nettool.ui.h:5
msgid "<b>IP Information</b>"
-msgstr "<b>IP স���ৰান�ত তথ�য</b>"
+msgstr "<b>IP তথ�য</b>"
#: ../data/gnome-nettool.ui.h:6
msgid "<b>Interface Information</b>"
-msgstr "<b>স�য��মাধ�যম স���ৰান�ত তথ�য</b>"
+msgstr "<b>�ন�ত�প�ষ�� তথ�য</b>"
#: ../data/gnome-nettool.ui.h:7
msgid "<b>Interface Statistics</b>"
-msgstr "<b>স�য��মাধ�যম স���ৰান�ত পৰিস���যান</b>"
+msgstr "<b>�ন�ত�প�ষ�� পৰিস���যা</b>"
#: ../data/gnome-nettool.ui.h:8
msgid "<b>Round Trip Time Statistics</b>"
-msgstr "<b>ৰা�ন�ড ��ৰিপ সম� স���ৰান�ত পৰিস���যান</b>"
+msgstr "<b>ৰা�ন�ড ��ৰিপ সম� পৰিস���যা</b>"
#: ../data/gnome-nettool.ui.h:9
msgid "<b>Transmission Statistics</b>"
-msgstr "<b>পৰিবহন স���ৰান�ত পৰিস���যান</b>"
+msgstr "<b>পৰিবহন পৰিস���যা</b>"
#: ../data/gnome-nettool.ui.h:10
msgid "Active Network Services"
-msgstr "স��ৰি� ন��ৱৰ�� পৰিস�বা"
+msgstr "স��ৰি� ন��ৱাৰ�� স�ৱাসম�হ"
#: ../data/gnome-nettool.ui.h:11
msgid "Average:"
@@ -126,31 +126,31 @@ msgstr "��:"
#: ../data/gnome-nettool.ui.h:12
msgid "Beep on ping"
-msgstr "ping হল� বিপ শব�দ �ৰা হ'ব"
+msgstr "ping হল� বিপ শব�দ �ৰিব"
#: ../data/gnome-nettool.ui.h:13
msgid "Clear _History"
-msgstr "�তিহাস ��তৰ�ৱা হ'ব (_H)"
+msgstr "�তিহাস পৰিষ��াৰ �ৰ� (_H)"
#: ../data/gnome-nettool.ui.h:14
msgid "Collisions:"
-msgstr "দ�বন�দ�ব:"
+msgstr "দ�বন�দ�বসম�হ:"
#: ../data/gnome-nettool.ui.h:15
msgid "Copy as text _report"
-msgstr "����স� ৰিপ�ৰ�� ৰ�প� �পি �ৰা হ'ব (_r)"
+msgstr "লি�ন� স�বাদ ৰ�প� �পি �ৰ� (_r)"
#: ../data/gnome-nettool.ui.h:16
msgid "Details"
-msgstr "বিবৰণ"
+msgstr "বিবৰণসম�হ"
#: ../data/gnome-nettool.ui.h:17
msgid "Devices"
-msgstr "যন�ত�ৰসম�হ"
+msgstr "ডিà¦à¦¾à¦?à¦?সমà§?হ"
#: ../data/gnome-nettool.ui.h:18
msgid "Devices - Network Tools"
-msgstr "Devices - ন��ৱৰ�� সম�পৰ��িত সৰ���াম"
+msgstr "ডিà¦à¦¾à¦?à¦?সমà§?হ - নà§?à¦?ৱাৰà§?à¦? সমà§?পৰà§?à¦?িত সà¦?à¦?à§?লিসমà§?হ"
#: ../data/gnome-nettool.ui.h:19
msgid "Display:"
@@ -165,7 +165,7 @@ msgid ""
"Enter a domain address to lookup its whois information. For example: www."
"domain.com or 192.168.2.1"
msgstr ""
-"whois তথ�য lookup �ৰাৰ বাব� ড�ম��ননৰ ঠি�না লি�� ।\n"
+"whois তথ�য lookup �ৰাৰ বাব� ড�ম��ননৰ ঠি�না লি��।\n"
"�দাহৰণস�বৰ�প: www.domain.com �থবা 192.168.2.1"
#: ../data/gnome-nettool.ui.h:22
@@ -173,7 +173,7 @@ msgid ""
"Enter the network address to finger that user. For example: www.domain.com "
"or 192.168.2.1"
msgstr ""
-"ব�যৱহাৰ�ৰ�তা� finger �ৰাৰ বাব� ন��ৱৰ�� ঠি�না লি�� ।\n"
+"ব�যৱহাৰ�াৰ�� finger �ৰাৰ বাব� ন��ৱাৰ�� ঠি�না লি��।\n"
"�দাহৰণস�বৰ�প: auth.domain.com �থবা 192.168.2.1"
#: ../data/gnome-nettool.ui.h:23
@@ -181,14 +181,14 @@ msgid ""
"Enter the network address to lookup. For example: www.domain.com or "
"192.168.2.1"
msgstr ""
-"lookup �ৰাৰ বাব� ন��ৱৰ�� ঠি�না লি�� ।\n"
+"lookup �ৰাৰ বাব� ন��ৱাৰ�� ঠি�না লি��।\n"
"�দাহৰণস�বৰ�প: www.domain.com �থবা 192.168.2.1"
#: ../data/gnome-nettool.ui.h:24
msgid ""
"Enter the network address to ping. For example: www.domain.com or 192.168.2.1"
msgstr ""
-"lookup �ৰাৰ বাব� ন��ৱৰ�� ঠি�না লি�� ।\n"
+"lookup �ৰাৰ বাব� ন��ৱাৰ�� ঠি�না লি��।\n"
"��দাহৰণস�বৰ�প: www.domain.com �থবা 192.168.2.1"
#: ../data/gnome-nettool.ui.h:25
@@ -196,7 +196,7 @@ msgid ""
"Enter the network address to scan for open ports. For example: www.domain."
"com or 192.168.2.1"
msgstr ""
-"��লা প�ৰ�� scan �ৰাৰ বাব� ন��ৱৰ�� ঠি�না লি�� ।\n"
+"��লা প�ৰ�� scan �ৰাৰ বাব� ন��ৱাৰ�� ঠি�না লি��।\n"
"�দাহৰণস�বৰ�প: www.domain.com �থবা 192.168.2.1"
#: ../data/gnome-nettool.ui.h:26
@@ -204,20 +204,20 @@ msgid ""
"Enter the network address to trace a route to. For example: www.domain.com "
"or 192.168.2.1"
msgstr ""
-"route trace �ৰাৰ বাব� ন��ৱৰ�� ঠি�না লি�� ।\n"
+"route trace �ৰাৰ বাব� ন��ৱাৰ�� ঠি�না লি��।\n"
"�দাহৰণস�বৰ�প: www.domain.com �থবা 192.168.2.1"
#: ../data/gnome-nettool.ui.h:27
msgid "Enter the user to finger"
-msgstr "finger �ৰাৰ বাব� ব�যৱহাৰ�ৰ�তা �ল�ল�� �ৰ� ।"
+msgstr "finger �ৰাৰ বাব� ব�যৱহাৰ�াৰ� �ল�ল�� �ৰ�।"
-#: ../data/gnome-nettool.ui.h:28 ../src/main.c:814
+#: ../data/gnome-nettool.ui.h:28 ../src/main.c:812
msgid "Finger"
msgstr "Finger"
#: ../data/gnome-nettool.ui.h:29
msgid "Finger output"
-msgstr "Finger ৰ পৰা প�ৰাপ�ত ফলাফল"
+msgstr "Finger -ৰ ���প��"
#: ../data/gnome-nettool.ui.h:30
msgid "Hardware address:"
@@ -225,19 +225,19 @@ msgstr "হাৰà§?ডৱà§?ৰ ঠিà
#: ../data/gnome-nettool.ui.h:31
msgid "Host"
-msgstr "��হস�থ"
+msgstr "হস��"
#: ../data/gnome-nettool.ui.h:32
msgid "Link speed:"
-msgstr "স�য���ৰ �তি:"
+msgstr "লি��� �তি:"
-#: ../data/gnome-nettool.ui.h:33 ../src/main.c:734
+#: ../data/gnome-nettool.ui.h:33 ../src/main.c:732
msgid "Lookup"
-msgstr "ল���প"
+msgstr "Lookup"
#: ../data/gnome-nettool.ui.h:34
msgid "Lookup output"
-msgstr "Lookup ৰ পৰা প�ৰাপ�ত ফলাফল"
+msgstr "Lookup -ৰ ���প��"
#: ../data/gnome-nettool.ui.h:35
msgid "MTU:"
@@ -253,7 +253,7 @@ msgstr "সৰ�বনিম�ন:"
#: ../data/gnome-nettool.ui.h:38
msgid "Multicast Information"
-msgstr "মাল��ি�াস�� স���ৰান�ত তথ�য"
+msgstr "মাল��ি�াস�� তথ�য"
#: ../data/gnome-nettool.ui.h:39
msgid "Multicast:"
@@ -265,11 +265,11 @@ msgstr "Netstat"
#: ../data/gnome-nettool.ui.h:41
msgid "Netstat output"
-msgstr "Netstat ৰ পৰা প�ৰাপ�ত ফলাফল"
+msgstr "Netstat -ৰ ���প��"
#: ../data/gnome-nettool.ui.h:42
msgid "Network address"
-msgstr "ন��ৱৰ��ৰ ঠি�না"
+msgstr "ন��ৱাৰ��ৰ ঠি�না"
#: ../data/gnome-nettool.ui.h:43
msgid "Not Available"
@@ -277,39 +277,39 @@ msgstr "�পস�থিত না�"
#: ../data/gnome-nettool.ui.h:44
msgid "Only"
-msgstr "��ল"
+msgstr "��ৱল"
#: ../data/gnome-nettool.ui.h:45
msgid "Output for finger"
-msgstr "finger-ৰ ফলাফল"
+msgstr "finger -ৰ ���প��"
#: ../data/gnome-nettool.ui.h:46
msgid "Output for lookup"
-msgstr "lookup-ৰ ফলাফল"
+msgstr "lookup -ৰ ���প��"
#: ../data/gnome-nettool.ui.h:47
msgid "Output for net stat"
-msgstr "net stat-ৰ ফলাফল"
+msgstr "net stat -ৰ ���প��"
#: ../data/gnome-nettool.ui.h:48
msgid "Output for port scan"
-msgstr "port scan-ৰ ফলাফল"
+msgstr "port scan -ৰ ���প��"
#: ../data/gnome-nettool.ui.h:49
msgid "Output for traceroute"
-msgstr "traceroute-ৰ ফলাফল"
+msgstr "traceroute -ৰ ���প��"
#: ../data/gnome-nettool.ui.h:50
msgid "Output for whois"
-msgstr "whois-ৰ ফলাফল"
+msgstr "whois -ৰ ���প��"
#: ../data/gnome-nettool.ui.h:51
msgid "Packets received:"
-msgstr "প�ৰাপ�ত প�যা���:"
+msgstr "প�ৰাপ�ত প����সম�হ:"
#: ../data/gnome-nettool.ui.h:52
msgid "Packets transmitted:"
-msgstr "প�ৰ�ৰিত প�যা���"
+msgstr "প�ৰ�ৰিত প����"
#: ../data/gnome-nettool.ui.h:53 ../src/main.c:290
msgid "Ping"
@@ -321,27 +321,27 @@ msgstr "Port Scan"
#: ../data/gnome-nettool.ui.h:55
msgid "Port scan output"
-msgstr "Port scan ৰ পৰা প�ৰাপ�ত ফলাফল"
+msgstr "Port scan -ৰ ���প��"
#: ../data/gnome-nettool.ui.h:56
msgid "Received bytes:"
-msgstr "প�ৰাপ�ত বা��:"
+msgstr "প�ৰাপ�ত বা��সম�হ:"
#: ../data/gnome-nettool.ui.h:57
msgid "Received packets:"
-msgstr "প�ৰাপ�ত প�যা���:"
+msgstr "প�ৰাপ�ত প����সম�হ:"
#: ../data/gnome-nettool.ui.h:58
msgid "Reception errors:"
-msgstr "�হৰণ�ৰ সম��াৰ সমস�যা:"
+msgstr "��ৰহণ ত�ৰ��িসম�হ:"
#: ../data/gnome-nettool.ui.h:59
msgid "Routing Table Information"
-msgstr "ৰ��ি� (routing) ��বিল স���ৰান�ত তথ�য"
+msgstr "ৰ��ি� (routing) ��ব�ল তথ�য"
-#: ../data/gnome-nettool.ui.h:60 ../src/main.c:619
+#: ../data/gnome-nettool.ui.h:60 ../src/main.c:617
msgid "Scan"
-msgstr "স���যান �ৰা হ'ব"
+msgstr "স���ন �ৰ�"
#: ../data/gnome-nettool.ui.h:61
msgid "Send:"
@@ -353,11 +353,11 @@ msgstr "�বস�থা:"
#: ../data/gnome-nettool.ui.h:63
msgid "Successful packets:"
-msgstr "Successful packets:"
+msgstr "সফ� প����সম�হ:"
#: ../data/gnome-nettool.ui.h:64 ../src/main.c:375
msgid "Trace"
-msgstr "Trace"
+msgstr "�ন�সৰণ �ৰ�"
#: ../data/gnome-nettool.ui.h:65
msgid "Traceroute"
@@ -365,43 +365,43 @@ msgstr "Traceroute"
#: ../data/gnome-nettool.ui.h:66
msgid "Traceroute output"
-msgstr "Traceroute-ৰ ফলাফল"
+msgstr "Traceroute -ৰ ���প��"
#: ../data/gnome-nettool.ui.h:67
msgid "Transmission errors:"
-msgstr "প�ৰ�ৰণ�ৰ সম��াৰ সমস�যা:"
+msgstr "প�ৰ�ৰণৰ ত�ৰ��িসম�হ:"
#: ../data/gnome-nettool.ui.h:68
msgid "Transmitted bytes:"
-msgstr "প�ৰ�ৰিত বা��:"
+msgstr "প�ৰ�ৰিত বা��সম�হ:"
#: ../data/gnome-nettool.ui.h:69
msgid "Transmitted packets:"
-msgstr "প�ৰ�ৰিত প�যা���"
+msgstr "প�ৰ�ৰিত প����সম�হ"
#: ../data/gnome-nettool.ui.h:70
msgid "Unlimited requests"
-msgstr "স�মাহ�ন �ন�ৰ�ধ"
+msgstr "স�মাহ�ন �ন�ৰ�ধসম�হ"
#: ../data/gnome-nettool.ui.h:71
msgid "User"
-msgstr "ব�যৱহাৰ�ৰ�তা"
+msgstr "ব�যৱহাৰ�াৰ�"
#: ../data/gnome-nettool.ui.h:72
msgid "User name"
-msgstr "ব�যৱহাৰ�ৰ�তাৰ নাম"
+msgstr "ব�যৱহাৰ�াৰ�ৰ নাম"
-#: ../data/gnome-nettool.ui.h:73 ../src/main.c:920
+#: ../data/gnome-nettool.ui.h:73 ../src/main.c:918
msgid "Whois"
msgstr "Whois"
#: ../data/gnome-nettool.ui.h:74
msgid "Whois output"
-msgstr "Whois-ৰ ফলাফল"
+msgstr "Whois -ৰ ���প��"
#: ../data/gnome-nettool.ui.h:75
msgid "_Configure"
-msgstr "বিন�যাস �ৰ� (_C)"
+msgstr "স�ৰ�পণ �ৰ� (_C)"
#: ../data/gnome-nettool.ui.h:76
msgid "_Domain address:"
@@ -409,184 +409,184 @@ msgstr "ডà§?মà§?à¦?নৰ ঠিà¦?à
#: ../data/gnome-nettool.ui.h:77
msgid "_Edit"
-msgstr "সম�পাদনা (_E)"
+msgstr "সম�পাদনা �ৰ� (_E)"
#: ../data/gnome-nettool.ui.h:78
msgid "_Help"
-msgstr "সাহায�য (_H)"
+msgstr "সহা� (_H)"
#: ../data/gnome-nettool.ui.h:79
msgid "_Information type:"
-msgstr "তথ�য�ৰ ধৰন:(_I)"
+msgstr "তথ�যৰ ধৰণ:(_I)"
#: ../data/gnome-nettool.ui.h:80
msgid "_Network address:"
-msgstr "ন��ৱৰ��ৰ ঠি�না:(_N)"
+msgstr "ন��ৱাৰ��ৰ ঠি�না:(_N)"
#: ../data/gnome-nettool.ui.h:81
msgid "_Network device:"
-msgstr "ন��ৱৰ�� যন�ত�ৰ:(_N)"
+msgstr "নà§?à¦?ৱাৰà§?à¦? ডিà¦à¦¾à¦?à¦?:(_N)"
#: ../data/gnome-nettool.ui.h:82
msgid "_Tool"
-msgstr "সৰ���াম (_T)"
+msgstr "স���লি (_T)"
#: ../data/gnome-nettool.ui.h:83
msgid "_Username:"
-msgstr "ব�যৱহাৰ�ৰ�তাৰ নাম:(_U)"
+msgstr "ব�যৱহাৰ�াৰ�ৰ নাম:(_U)"
#: ../data/gnome-nettool.ui.h:84
msgid "ms"
-msgstr "মি-স��-�ৰ মধ�য�"
+msgstr "ms"
#: ../data/gnome-nettool.ui.h:85
msgid "requests"
-msgstr "�ব�দন"
+msgstr "�ন�ৰ�ধসম�হ"
#. Interface Name Interface Type icon Device prefix Pixbuf
#: ../src/info.c:60
msgid "Other type"
-msgstr "�ন�য ধৰন"
+msgstr "�ন�য ধৰণ"
#: ../src/info.c:61
msgid "Ethernet Interface"
-msgstr "�থাৰন�� স�য��মাধ�যম"
+msgstr "�থাৰন�� �ন�ত�প�ষ��"
#: ../src/info.c:62
msgid "Wireless Interface"
-msgstr "ব�তাৰ (Wireless) স�য��মাধ�যম"
+msgstr "ব�তা�ৰ (Wireless) �ন�ত�প�ষ��"
#: ../src/info.c:63
msgid "Modem Interface"
-msgstr "ম�ড�ম�ৰ স�য��মাধ�যম"
+msgstr "ম�ড�মৰ �ন�ত�প�ষ��"
#: ../src/info.c:64
msgid "Parallel Line Interface"
-msgstr "প�যাৰাল�ল লা�ন স�য��মাধ�যম"
+msgstr "সমান�তৰাল ৰ��া �ন�ত�প�ষ��"
#: ../src/info.c:65
msgid "Infrared Interface"
-msgstr "�ন�ফ�ৰাৰ�ড স�য��মাধ�যম"
+msgstr "�ন�ফ�ৰাৰ�ড �ন�ত�প�ষ��"
#: ../src/info.c:66
msgid "Loopback Interface"
-msgstr "ল�পব�যা� স�য��মাধ�যম"
+msgstr "ল�পব�যা� �ন�ত�প�ষ��"
#: ../src/info.c:67
msgid "Unknown Interface"
-msgstr "��ানা স�য��মাধ�যম"
+msgstr "����াত �ন�ত�প�ষ��"
#: ../src/info.c:165
msgid "Network Devices Not Found"
-msgstr "ন��ৱৰ�� যন�ত�ৰ পাৱ যা�নি"
+msgstr "নà§?à¦?ৱাৰà§?à¦? ডিà¦à¦¾à¦?à¦? পà§?ৱা নà¦?ল"
-#: ../src/info.c:392 ../src/info.c:395
+#: ../src/info.c:400 ../src/info.c:403
msgid "Unknown"
-msgstr "��ানা"
+msgstr "����াত"
-#: ../src/info.c:466
+#: ../src/info.c:474
msgid "Active"
msgstr "স��ৰি�"
-#: ../src/info.c:468
+#: ../src/info.c:476
msgid "Inactive"
msgstr "নিষ���ৰি�"
-#: ../src/info.c:473
+#: ../src/info.c:481
msgid "Loopback"
msgstr "ল�পব�যা�"
-#: ../src/info.c:482
+#: ../src/info.c:490
msgid "Enabled"
-msgstr "স��ৰি�"
+msgstr "সামৰ�থবান"
-#: ../src/info.c:484
+#: ../src/info.c:492
msgid "Disabled"
-msgstr "Disabled"
+msgstr "�সামৰ�থবান"
#. The info output in a text format (to copy on clipboard)
-#: ../src/info.c:573
+#: ../src/info.c:581
#, c-format
msgid "Network device:\t%s\n"
-msgstr "ন��ৱৰ�� যন�ত�ৰ:\t%s\n"
+msgstr "নà§?à¦?ৱাৰà§?à¦? ডিà¦à¦¾à¦?à¦?:\t%s\n"
-#: ../src/info.c:574
+#: ../src/info.c:582
#, c-format
msgid "Hardware address:\t%s\n"
msgstr "হাৰ�ডৱ�ৰ ঠি�না:\t%s\n"
-#: ../src/info.c:575
+#: ../src/info.c:583
#, c-format
msgid "Multicast:\t%s\n"
msgstr "মাল��ি�াস��:\t%s\n"
-#: ../src/info.c:576
+#: ../src/info.c:584
#, c-format
msgid "MTU:\t%s\n"
msgstr "MTU:\t%s\n"
-#: ../src/info.c:577
+#: ../src/info.c:585
#, c-format
msgid "Link speed:\t%s\n"
-msgstr "স�য���ৰ �তি:\t%s\n"
+msgstr "লি���ৰ �তি:\t%s\n"
-#: ../src/info.c:578
+#: ../src/info.c:586
#, c-format
msgid "State:\t%s\n"
msgstr "�বস�থা:\t%s\n"
-#: ../src/info.c:580
+#: ../src/info.c:588
#, c-format
msgid "Transmitted packets:\t%s\n"
-msgstr "প�ৰ�ৰিত প�যা���:\t%s\n"
+msgstr "প�ৰ�ৰিত প����সম�হ:\t%s\n"
-#: ../src/info.c:581
+#: ../src/info.c:589
#, c-format
msgid "Transmission errors:\t%s\n"
-msgstr "প�ৰ�ৰণ �ৰত� সমস�যা:\t%s\n"
+msgstr "প�ৰ�ৰণ ত�ৰ��িসম�হ:\t%s\n"
-#: ../src/info.c:582
+#: ../src/info.c:590
#, c-format
msgid "Received packets:\t%s\n"
-msgstr "প�ৰাপ�ত প�যা���:\t%s\n"
+msgstr "প�ৰাপ�ত প����সম�হ:\t%s\n"
-#: ../src/info.c:583
+#: ../src/info.c:591
#, c-format
msgid "Reception errors:\t%s\n"
-msgstr "�হৰণ�ৰ সম��াৰ সমস�যা:\t%s\n"
+msgstr "��ৰহণৰ ত�ৰ��িসম�হ:\t%s\n"
-#: ../src/info.c:584
+#: ../src/info.c:592
#, c-format
msgid "Collisions:\t%s\n"
-msgstr "দ�বন�দ�ব (�লিশন):\t%s\n"
+msgstr "দ�বন�দ�বসম�হ:\t%s\n"
-#: ../src/info.h:27
+#: ../src/info.h:24
msgid "not available"
msgstr "�পস�থিত না�"
-#: ../src/lookup.c:80
+#: ../src/lookup.c:85
#, c-format
msgid "Looking up %s"
-msgstr "%s �ন�সন�ধান �ৰা হ����"
+msgstr "%s �ন�সন�ধান �ৰা হ� ���"
-#: ../src/lookup.c:274
+#: ../src/lookup.c:279
msgid "Name"
msgstr "নাম"
#. Time To Live of a hostname in a name server
-#: ../src/lookup.c:283
+#: ../src/lookup.c:288
msgid "TTL"
msgstr "TTL"
-#: ../src/lookup.c:292
+#: ../src/lookup.c:297
msgid "Address Type"
-msgstr "ঠি�নাৰ ধৰন"
+msgstr "ঠি�নাৰ ধৰণ"
-#: ../src/lookup.c:302
+#: ../src/lookup.c:307
msgid "Record Type"
-msgstr "ৰ��ৰ�ড�ৰ ধৰন"
+msgstr "ৰ��ৰ�ডৰ ধৰণ"
-#: ../src/lookup.c:311
+#: ../src/lookup.c:316
msgid "Address"
msgstr "ঠি�না"
@@ -596,13 +596,13 @@ msgstr "ঠি�না"
#. Record Type (A, PTR, HINFO, NS, TXT, etc.),
#. Resolution (results of the query)
#. It's a tabular output, and these belongs to the column titles
-#: ../src/lookup.c:339
+#: ../src/lookup.c:344
msgid "Source\tTTL\tAddress Type\tRecord Type1\tResolution\n"
-msgstr "Source\tTTL\tAddress Type\tRecord Type1\tResolution\n"
+msgstr "à¦?à§?স\tTTL\tঠিà¦?নাৰ ধৰণ\tৰà§?à¦?ৰà§?ড ধৰণ১\tবিà¦à§?দন\n"
#: ../src/main.c:82
msgid "Load information for a network device"
-msgstr "ন��ৱৰ�� যন�ত�ৰ স���ৰান�ত তথ�য ল�ড �ৰা হ'ব"
+msgstr "à¦?à¦?া নà§?à¦?ৱাৰà§?à¦? ডিà¦à¦¾à¦?à¦?ৰ বাবà§? তথà§?য লà§?ড à¦?ৰà¦?"
#: ../src/main.c:83
msgid "DEVICE"
@@ -610,7 +610,7 @@ msgstr "DEVICE"
#: ../src/main.c:86
msgid "Send a ping to a network address"
-msgstr "���ি ন��ৱৰ�� ��যাড�ৰ�স� পি� �ৰা হ'ব"
+msgstr "��া ন��ৱাৰ�� ঠি�নাল� ��া পি� পঠা��"
#: ../src/main.c:87 ../src/main.c:95 ../src/main.c:99 ../src/main.c:103
msgid "HOST"
@@ -619,7 +619,7 @@ msgstr "HOST"
#: ../src/main.c:90
msgid "Get netstat information. Valid options are: route, active, multicast."
msgstr ""
-"netstat স���ৰান�ত তথ�য �হৰণ �ৰা হ'ব । ব�ধ �পশন হল: route, active, multicast ।"
+"netstat তথ�য প�ৰাপ�ত �ৰ�। ব�ধ বি�ল�পসম�হ হল: পথ, স��ৰি�, মাল��ি�াস��।"
#: ../src/main.c:91
msgid "COMMAND"
@@ -627,19 +627,19 @@ msgstr "COMMAND"
#: ../src/main.c:94
msgid "Trace a route to a network address"
-msgstr "���ি ন��ৱৰ�� ��যাড�ৰ�স�ৰ ৰ�� �ন�সৰণ �ৰা হ'ব"
+msgstr "��া ন��ৱাৰ�� ঠি�নাল� ��া পথ �ন�সৰণ �ৰ�"
#: ../src/main.c:98
msgid "Port scan a network address"
-msgstr "���ি ন��ৱৰ�� ��যাড�ৰ�স�ৰ প�ৰ�� স���যান �ৰা হ'ব"
+msgstr "��া ন��ৱাৰ�� ঠি�না প�ৰ�� স���ন �ৰ�"
#: ../src/main.c:102
msgid "Look up a network address"
-msgstr "ন��ৱৰ�� ��যাড�ৰ�স �ন�সন�ধান �ৰা হ'ব"
+msgstr "ন��ৱাৰ�� ঠি�না �ন�সন�ধান �ৰা হ'ব"
#: ../src/main.c:106
msgid "Finger command to run"
-msgstr "Finger �মান�ড �ালান� হ'ব"
+msgstr "�লাব ল�ি�া Finger �মান�ড"
#: ../src/main.c:107
msgid "USER"
@@ -647,7 +647,7 @@ msgstr "USER"
#: ../src/main.c:110
msgid "Perform a whois lookup for a network domain"
-msgstr "���ি ন��ৱৰ�� ড�ম��ন� whois lookup �ৰা হ'ব"
+msgstr "��া ন��ৱাৰ�� ড�ম��নত whois lookup পৰিৱ�শন �ৰ�"
#: ../src/main.c:111
msgid "DOMAIN"
@@ -659,10 +659,10 @@ msgid ""
"The file %s doesn't exist, please check if gnome-nettool is correctly "
"installed"
msgstr ""
-"%s ফাà¦?লà¦?ি à¦?পসà§?থিত নাà¦?, à¦?নà§?à¦?à§?ৰহ à¦?ৰà§? পৰà§?à¦?à§?ষা à¦?ৰà¦? gnome-nettool সঠিà¦?à¦à¦¾à¦¬à§? à¦?নসà§?à¦?ল à¦?ৰা "
-"��� �ি না"
+"%s নথিপতà§?ৰà¦?à§? à¦?পসà§?থিত নাà¦?, à¦?নà§?à¦?à§?ৰহ à¦?ৰি পৰà§?à¦?à§?ষা à¦?ৰà¦? gnome-nettool সঠিà¦?à¦à¦¾à¦¬à§? à¦?নসà§?à¦?ল à¦?ৰা "
+"��� ন� না�"
-#: ../src/main.c:482 ../src/netstat.c:443
+#: ../src/main.c:482 ../src/netstat.c:455
msgid "Protocol"
msgstr "প�ৰ����ল"
@@ -672,295 +672,295 @@ msgstr "IP ঠি�না"
#: ../src/main.c:496
msgid "Netmask / Prefix"
-msgstr "ন��মাস�� / �পপদ (প�ৰ�ফি��স)"
+msgstr "ন��মাস�� / �পসৰ��"
#: ../src/main.c:503
msgid "Broadcast"
-msgstr "ব�ৰড�াস��"
+msgstr "সম�প�ৰ�াৰ �ৰ�"
#: ../src/main.c:510
msgid "Scope"
msgstr "পৰিধি"
-#: ../src/main.c:669
+#: ../src/main.c:667
msgid "Default Information"
msgstr "�বি�ল�পিত তথ�য"
-#: ../src/main.c:670
+#: ../src/main.c:668
msgid "Internet Address"
msgstr "�ন��াৰন�� ঠি�না"
-#: ../src/main.c:671
+#: ../src/main.c:669
msgid "Canonical Name"
msgstr "নাম"
-#: ../src/main.c:672
+#: ../src/main.c:670
msgid "CPU / OS Type"
-msgstr "OS ধৰন"
+msgstr "CPU / OS ধৰণ"
#. When asking for MX record in DNS context
-#: ../src/main.c:674
+#: ../src/main.c:672
msgid "Mailbox Exchange"
-msgstr "Mailbox Exchange"
+msgstr "ম��লবা�� �দল বদল"
-#: ../src/main.c:675
+#: ../src/main.c:673
msgid "Mailbox Information"
-msgstr "তথ�য"
+msgstr "ম��লবা��তথ�য"
#. When asking for NS record in DNS context
-#: ../src/main.c:677
+#: ../src/main.c:675
msgid "Name Server"
-msgstr "নাম স�ৱ�"
+msgstr "নাম à¦?াৰà§?à¦à¦¾à§°"
-#: ../src/main.c:678
+#: ../src/main.c:676
msgid "Host name for Address"
-msgstr "��হস�থ �ল�লি�িত সম� �বধি ঠি�না"
+msgstr "ঠি�নাৰ বাব� হস��নাম"
-#: ../src/main.c:679
+#: ../src/main.c:677
msgid "Start-of-authority"
-msgstr "�ৰম�ঠসৰ�বম��"
+msgstr "à¦?তà§?পà¦?à§?ষ-ৰ-à¦?ৰমà§?à¦"
-#: ../src/main.c:680
+#: ../src/main.c:678
msgid "Text Information"
-msgstr "����স� তথ�য"
+msgstr "লি�ন� তথ�য"
-#: ../src/main.c:681
+#: ../src/main.c:679
msgid "Well Known Services"
-msgstr "স�ৱা"
+msgstr "à¦à¦¾à¦²à¦¦à§°à§? à¦?à§?à¦?াত সà§?ৱাসমà§?হ"
-#: ../src/main.c:682
+#: ../src/main.c:680
msgid "Any / All Information"
-msgstr "স�ল তথ�য"
+msgstr "যি��ন� / স�ল� তথ�য"
-#: ../src/netstat.c:122
+#: ../src/netstat.c:134
msgid "Getting routing table"
-msgstr "ৰ��ি� (routing) ��বিল �হৰণ �ৰা হ����"
+msgstr "ৰ��ি� ��ব�ল প�ৰাপ�ত �ৰা হ� ���"
-#: ../src/netstat.c:137
+#: ../src/netstat.c:149
msgid "Getting active Internet connections"
-msgstr "স��ৰি� �ন��াৰন�� স�য�� �হৰণ �ৰা হ����"
+msgstr "স��ৰি� �ন��াৰন�� স�য��সম�হ প�ৰাপ�ত �ৰা হ� ���"
-#: ../src/netstat.c:146
+#: ../src/netstat.c:158
msgid "Getting group memberships"
-msgstr "দল�ৰ সদস�যতা �হৰণ �ৰা হ����"
+msgstr "দলৰ সদস�যতা প�ৰাপ�ত �ৰা হ� ���"
-#: ../src/netstat.c:450
+#: ../src/netstat.c:462
msgid "IP Source"
-msgstr "IP-ৰ ��স"
+msgstr "IP -ৰ ��স"
-#: ../src/netstat.c:458
+#: ../src/netstat.c:470
msgid "Port/Service"
-msgstr "প�ৰ��/পৰিস�বা"
+msgstr "প�ৰ��/স�ৱা"
-#: ../src/netstat.c:466 ../src/scan.c:314
+#: ../src/netstat.c:478 ../src/scan.c:318
msgid "State"
msgstr "�বস�থা"
-#: ../src/netstat.c:609
+#: ../src/netstat.c:632
msgid "Destination/Prefix"
-msgstr "�ন�তব�য/�পপদ"
+msgstr "�ন�তব�য/�পসৰ��"
-#: ../src/netstat.c:611
+#: ../src/netstat.c:634
msgid "Destination"
msgstr "�ন�তব�য"
-#: ../src/netstat.c:618
+#: ../src/netstat.c:641
msgid "Gateway"
-msgstr "������"
+msgstr "���ৱ�"
-#: ../src/netstat.c:626
+#: ../src/netstat.c:649
msgid "Netmask"
msgstr "ন��মাস��"
-#: ../src/netstat.c:634 ../src/netstat.c:741
+#: ../src/netstat.c:657 ../src/netstat.c:764
msgid "Interface"
-msgstr "স�য��মাধ�যম"
+msgstr "�ন�ত�প�ষ��"
-#: ../src/netstat.c:748
+#: ../src/netstat.c:771
msgid "Member"
msgstr "সদস�য"
-#: ../src/netstat.c:756
+#: ../src/netstat.c:779
msgid "Group"
msgstr "দল"
#. The netstat "Display active network services" output in
#. text format.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/netstat.c:798
+#: ../src/netstat.c:821
msgid "Protocol\tIP Source\tPort/Service\tState\n"
-msgstr "Protocol\tIP Source\tPort/Service\tState\n"
+msgstr "প�ৰ���ল\tIP ��স\tপ�ৰ��/স�ৱা\t�ৱস�থা\n"
#. The netstat "Display routing" output in text format.
#. This seems as a route table.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/netstat.c:804
+#: ../src/netstat.c:827
msgid "Destination\tGateway\tNetmask\tInterface\n"
-msgstr "Destination\tGateway\tNetmask\tInterface\n"
+msgstr "�ন�তব�য\t���ৱ�\tন��মাস��\t�ন�ত�প�ষ��\n"
#. The netstat "Multicast information" output in text format.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/netstat.c:809
+#: ../src/netstat.c:832
msgid "Interface\tMember\tGroup\n"
-msgstr "Interface\tMember\tGroup\n"
+msgstr "�ন�ত�প�ষ��\tসদস�য\tদল\n"
-#: ../src/nettool.c:199
+#: ../src/nettool.c:204
msgid "A network address was not specified"
-msgstr "ন��ৱৰ��ৰ ��যাড�ৰ�স �ল�ল�� �ৰা হ�নি"
+msgstr "��া ন��ৱাৰ�� ঠি�না ধাৰ�য�য �ৰা হ�ৱা না�"
-#: ../src/nettool.c:200 ../src/nettool.c:209
+#: ../src/nettool.c:205 ../src/nettool.c:214
msgid "Please enter a valid network address and try again."
-msgstr "�ন���ৰহ �ৰ� ���ি ব�ধ ন��ৱৰ�� ��যাড�ৰ�স লি�� প�নৰা� ��ষ��া �ৰ� ।"
+msgstr "�ন���ৰহ �ৰি ��া ব�ধ ন��ৱাৰ�� ঠি�না লি�ি প�নৰ ��ষ��া �ৰ�।"
-#: ../src/nettool.c:207
+#: ../src/nettool.c:212
#, c-format
msgid "The address '%s' cannot be found"
-msgstr "'%s' ঠি�না�ি পাৱ যা�নি"
+msgstr "'%s' ঠি�না�� প�ৱা ন�ল"
-#: ../src/nettool.c:236
+#: ../src/nettool.c:241
msgid "A domain address was not specified"
-msgstr "ড�ম��নৰ ��যাড�ৰ�স �ল�ল�� �ৰা হ�নি"
+msgstr "��া ড�ম��ন ঠি�না ধাৰ�য�য �ৰা হ�ৱা না�"
-#: ../src/nettool.c:237
+#: ../src/nettool.c:242
msgid "Please enter a valid domain address and try again."
-msgstr "�ন���ৰহ �ৰ� ���ি ব�ধ ড�ম��ন ��যাড�ৰ�স লি�� প�নৰা� ��ষ��া �ৰ� ।"
+msgstr "�ন���ৰহ �ৰি ��া ব�ধ ড�ম��ন ঠি�না লি�ি প�নৰ ��ষ��া �ৰ�।"
-#: ../src/nettool.c:428
+#: ../src/nettool.c:433
msgid "Information not available"
msgstr "তথ�য �পলব�ধ ন�"
-#: ../src/nettool.c:548
+#: ../src/nettool.c:553
msgid "Stop"
msgstr "বন�ধ �ৰ�"
-#: ../src/nettool.c:554
+#: ../src/nettool.c:559
msgid "Run"
-msgstr "স���ালন �ৰ�"
+msgstr "�লা��"
#. Created up here so we can get the geometry info.
-#: ../src/ping.c:151
+#: ../src/ping.c:155
msgid "Time (ms):"
-msgstr "সম� মি-স��-�ৰ মধ�য�:"
+msgstr "সম� (ms) :"
-#: ../src/ping.c:171
+#: ../src/ping.c:176
msgid "Seq. No.:"
msgstr "��রমি� স���যা:"
-#: ../src/ping.c:254
+#: ../src/ping.c:261
#, c-format
msgid "Sending ping requests to %s"
-msgstr "%s-� ping �ন�ৰ�ধ �ানান� হ����"
+msgstr "%s -ত ping �ন�ৰ�ধ পঠ�ৱা হ� ���"
-#: ../src/ping.c:569
+#: ../src/ping.c:577
msgid "Bytes"
-msgstr "বা��"
+msgstr "বা��সম�হ"
-#: ../src/ping.c:576
+#: ../src/ping.c:584
msgid "Source"
msgstr "��স"
-#: ../src/ping.c:584
+#: ../src/ping.c:592
msgid "Seq"
msgstr "Seq"
-#: ../src/ping.c:594
+#: ../src/ping.c:602
msgid "Time"
msgstr "সম�"
-#: ../src/ping.c:602
+#: ../src/ping.c:610
msgid "Units"
-msgstr "���"
+msgstr "���সম�হ"
#. The ping output in text format:
#. Bytes received, Address Source, Number of Sequence,
#. Round Trip Time (Time), Units of Time.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/ping.c:628
+#: ../src/ping.c:636
msgid "Bytes\tSource\tSeq\tTime\tUnits\n"
-msgstr "Bytes\tSource\tSeq\tTime\tUnits\n"
+msgstr "বা��সম�হ\t��স\tSeq\tসম�\t���সম�হ\n"
#. The ping output in a text format (to copy on clipboard)
-#: ../src/ping.c:643
+#: ../src/ping.c:651
#, c-format
msgid "Time minimum:\t%s ms\n"
msgstr "সৰ�বনিম�ন সম�:\t%s ms\n"
-#: ../src/ping.c:644
+#: ../src/ping.c:652
#, c-format
msgid "Time average:\t%s ms\n"
msgstr "�� সম�:\t%s ms\n"
-#: ../src/ping.c:645
+#: ../src/ping.c:653
#, c-format
msgid "Time maximum:\t%s ms\n"
msgstr "সৰ�ব���� সম�:\t%s ms\n"
-#: ../src/ping.c:647
+#: ../src/ping.c:655
#, c-format
msgid "Packets transmitted:\t%s\n"
-msgstr "প�ৰ�ৰিত প�যা���:\t%s\n"
+msgstr "প�ৰ�ৰিত প����সম�হ:\t%s\n"
-#: ../src/ping.c:649
+#: ../src/ping.c:657
#, c-format
msgid "Packets received:\t%s\n"
-msgstr "প�ৰাপ�ত প�যা���:\t%s\n"
+msgstr "প�ৰাপ�ত প����সম�হ:\t%s\n"
-#: ../src/ping.c:652
+#: ../src/ping.c:660
#, c-format
msgid "Successful packets:\t%s\n"
-msgstr "Successful packets:\t%s\n"
+msgstr "সফল প����সম�হ:\t%s\n"
-#: ../src/scan.c:94
+#: ../src/scan.c:98
#, c-format
msgid "Scanning %s for open ports"
-msgstr "��লা প�ৰ���ৰ সন�ধান� %s-� �ন�সন�ধান �ৰা হ����"
+msgstr "��লা প�ৰ���ৰ সন�ধানত %s -ত �ন�সন�ধান �ৰা হ� ���"
-#: ../src/scan.c:169
+#: ../src/scan.c:173
msgid "unknown"
msgstr "����াত"
#. Translators: "open" is a network status and should be one word.
-#: ../src/scan.c:173
+#: ../src/scan.c:177
msgid "open"
msgstr "��ল�"
-#: ../src/scan.c:306
+#: ../src/scan.c:310
msgid "Port"
msgstr "প�ৰ��"
-#: ../src/scan.c:322
+#: ../src/scan.c:326
msgid "Service"
-msgstr "পৰিস�বা"
+msgstr "স�ৱা"
#. The portscan output in text format:
#. Port, State, Service.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/scan.c:344
+#: ../src/scan.c:348
msgid "Port\tState\tService\n"
-msgstr "Port\tState\tService\n"
+msgstr "প�ৰ��\t�ৱস�থা\tস�ৱা\n"
-#: ../src/traceroute.c:62
+#: ../src/traceroute.c:66
#, c-format
msgid "Tracing route to %s"
-msgstr "%s �বধি ৰ�� (route) �ন�সৰণ �ৰা হ����"
+msgstr "%s ল� পথ �ন�সৰণ �ৰা হ� ���"
-#: ../src/traceroute.c:265
+#: ../src/traceroute.c:269
msgid "Hop"
msgstr "হপ"
-#: ../src/traceroute.c:273
+#: ../src/traceroute.c:277
msgid "Hostname"
-msgstr "��হস�থৰনাম"
+msgstr "হস��নাম"
-#: ../src/traceroute.c:281
+#: ../src/traceroute.c:285
msgid "IP"
msgstr "IP"
-#: ../src/traceroute.c:292
+#: ../src/traceroute.c:296
msgid "Time 1"
msgstr "সম� ১"
-#: ../src/traceroute.c:302
+#: ../src/traceroute.c:306
msgid "Time 2"
msgstr "সম� ২"
@@ -968,43 +968,43 @@ msgstr "সম� ২"
#. Hop count, Hostname, IP, Round Trip Time 1 (Time1),
#. Round Trip Time 2 (Time2),
#. It's a tabular output, and these belongs to the column titles
-#: ../src/traceroute.c:328
+#: ../src/traceroute.c:332
msgid "Hop\tHostname\tIP\tTime 1\tTime 2\n"
-msgstr "Hop\tHostname\tIP\tTime 1\tTime 2\n"
+msgstr "হপ\tহস��নাম\tIP\tসম� ১\tসম� ২\n"
-#: ../src/utils.c:227
+#: ../src/utils.c:231
#, c-format
msgid ""
"In order to use this feature of the program, %s must be installed in your "
"system"
-msgstr "প�ৰ���ৰাম�ৰ �� ব�শিষ���য ব�যৱহাৰ�ৰ বাব� সিস���ম� %s �নস��ল �ৰা �বশ�য�"
+msgstr "প�ৰ���ৰামৰ �� ব�শিষ���য ব�যৱহাৰ�ৰ বাব� �িস���ম %s �নস��ল থা�িব লা�িব"
-#: ../src/finger.c:63
+#: ../src/finger.c:66
#, c-format
msgid "Getting information of %s on \"%s\""
-msgstr "%s স��ৰান�ত তথ�য । যা \"%s\"-� ���, তা �হৰণ �ৰা হ����"
+msgstr "\"%s\" -ত %s -ৰ তথ�য প�ৰাপ�ত �ৰা হ� ���"
-#: ../src/finger.c:67
+#: ../src/finger.c:70
#, c-format
msgid "Getting information of all users on \"%s\""
-msgstr "\"%s\"-� �পস�থিত স�ল ব�যৱহাৰ�ৰ�তা স���ৰান�ত তথ�য �হৰণ �ৰা হ����"
+msgstr "\"%s\" -ত �পস�থিত স�ল� ব�যৱহাৰ�াৰ� তথ�য প�ৰাপ�ত �ৰা হ� ���"
-#: ../src/whois.c:58
+#: ../src/whois.c:62
#, c-format
msgid "Getting the whois information of %s"
-msgstr "%s-ৰ বাব� whois তথ�য �হৰণ �ৰা হ����"
+msgstr "%s -ৰ বাব� whois তথ�য প�ৰাপ�ত �ৰা হ� ���"
#~ msgid "Broadcast:"
#~ msgstr "ব�ৰড�াস��:"
#~ msgid "IP Address:"
-#~ msgstr "IP ��যাড�ৰ�স:"
+#~ msgstr "IP ঠি�না:"
#~ msgid "Netmask:"
#~ msgstr "ন��মাস��:"
#~ msgid "IP address:\t%s\n"
-#~ msgstr "IP ��যাড�ৰ�স:\t%s\n"
+#~ msgstr "IP ঠি�না:\t%s\n"
#~ msgid "Netmask:\t%s\n"
#~ msgstr "ন��মাস��:\t%s\n"
diff -pruN 3.0.0-2/po/ast.po 3.0.1-0ubuntu1/po/ast.po
--- 3.0.0-2/po/ast.po 2010-12-02 09:26:14.000000000 +0000
+++ 3.0.1-0ubuntu1/po/ast.po 2011-12-31 23:54:24.000000000 +0000
@@ -2,366 +2,449 @@
# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
# This file is distributed under the same license as the gnome-nettool package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
-#
+# Xandru Armesto <xandru softastur org>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: gnome-nettool\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-10 09:47+0100\n"
-"PO-Revision-Date: 2009-02-10 01:00+0100\n"
-"Last-Translator: Mikel González <astur softastur org>\n"
-"Language-Team: Asturian <gnome softastur org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
+"nettool&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-11-15 23:04+0000\n"
+"PO-Revision-Date: 2011-12-17 16:50+0200\n"
+"Last-Translator: Xandru Armesto <xandru softastur org>\n"
+"Language-Team: Softastur alministradores softastur org\n"
+"Language: ast\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-02-09 23:56+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.0\n"
+"X-Launchpad-Export-Date: 2011-10-24 12:28+0000\n"
+"X-Project-Style: gnome\n"
-#: ../src/callbacks.c:323
+#: ../src/callbacks.c:332
msgid "translator-credits"
msgstr ""
"Launchpad Contributions:\n"
-" Astur https://launchpad.net/~malditoastur";
+" Iñigo Varela https://launchpad.net/~ivarela\n";
+" Mikel González https://launchpad.net/~astur-softastur\n";
+" Xuacu Saturio https://launchpad.net/~xuacusk8";
#. Translators: %s is the name of the copyright holder
-#: ../src/callbacks.c:330
+#: ../src/callbacks.c:339
#, c-format
msgid "Copyright © 2003-2008 %s"
msgstr "Copyright © 2003-2008 %s"
#. Dear translator: This is the name of the application
-#: ../src/callbacks.c:334 ../src/callbacks.c:335
-#: ../src/gnome-nettool.desktop.in.in.h:1
+#: ../src/callbacks.c:343 ../src/callbacks.c:344
+#: ../data/gnome-nettool.desktop.in.in.h:1
msgid "Network Tools"
msgstr "Ferramientes de rede"
-#: ../src/callbacks.c:337
+#: ../src/callbacks.c:346
msgid "Graphical user interface for common network utilities"
msgstr "Interfaz gráficu d'usuariu pa utilidaes comunes de rede"
-#: ../src/callbacks.c:450 ../src/main.c:140 ../src/nettool.c:461
+#: ../src/callbacks.c:458 ../src/main.c:142 ../src/nettool.c:488
msgid "Idle"
-msgstr ""
+msgstr "Inactivu"
#. Dear Translator: This is the Window Title. 'Network Tools' is the
#. * name of the application
-#: ../src/callbacks.c:455
+#: ../src/callbacks.c:463
#, c-format
msgid "%s - Network Tools"
msgstr "%s - Ferramientes de rede"
-#: ../src/callbacks.c:479
+#: ../src/callbacks.c:487
msgid "Unable to open help file"
-msgstr "Nun soi a abrir el ficheru d'aida"
+msgstr "Nun pudo abrise'l ficheru d'ayuda"
+
+#: ../data/gnome-nettool.desktop.in.in.h:2
+msgid "View information about your network"
+msgstr "Ver información de la to rede"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:1
+msgid "A list of domains previously used"
+msgstr "Una llista de dominios usaos previamente"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:2
+msgid "A list of hostnames previously used"
+msgstr "Una llista de nomes de sirvidores usaos previamente"
-#: ../src/gnome-nettool.glade.h:1
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:3
+msgid "A list of usernames previously used"
+msgstr "Una llista de nomes d'usuariu usaos previamente"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:4
+msgid "Historically used domains"
+msgstr "Dominios usaos históricamente"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:5
+msgid "Historically used hostnames"
+msgstr "Sirvidores usaos históricamente"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:6
+msgid "Historically used usernames"
+msgstr "Nomes d'usuariu usaos históricamente"
+
+#: ../data/gnome-nettool.ui.h:1
msgid "0"
msgstr "0"
-#: ../src/gnome-nettool.glade.h:3
+#: ../data/gnome-nettool.ui.h:3
#, no-c-format
msgid "0%"
msgstr "0%"
-#: ../src/gnome-nettool.glade.h:4
+#: ../data/gnome-nettool.ui.h:4
msgid "0.0"
msgstr "0.0"
-#: ../src/gnome-nettool.glade.h:5
+#: ../data/gnome-nettool.ui.h:5
msgid "<b>IP Information</b>"
msgstr "<b>Información IP</b>"
-#: ../src/gnome-nettool.glade.h:6
+#: ../data/gnome-nettool.ui.h:6
msgid "<b>Interface Information</b>"
-msgstr "<b>Información d'interfaz</b>"
+msgstr "<b>Información d'interface</b>"
-#: ../src/gnome-nettool.glade.h:7
+#: ../data/gnome-nettool.ui.h:7
msgid "<b>Interface Statistics</b>"
-msgstr "<b>EstadÃsitiques d'Interfaz</b>"
+msgstr "<b>EstadÃstiques d'Interface</b>"
-#: ../src/gnome-nettool.glade.h:8
+#: ../data/gnome-nettool.ui.h:8
msgid "<b>Round Trip Time Statistics</b>"
msgstr "<b>EstadÃstiques de tiempu mediu de circulación</b>"
-#: ../src/gnome-nettool.glade.h:9
+#: ../data/gnome-nettool.ui.h:9
msgid "<b>Transmission Statistics</b>"
msgstr "<b>EstadÃstiques de tresmisión</b>"
-#: ../src/gnome-nettool.glade.h:10
+#: ../data/gnome-nettool.ui.h:10
msgid "Active Network Services"
msgstr "Ver servicios de rede activos"
-#: ../src/gnome-nettool.glade.h:11
+#: ../data/gnome-nettool.ui.h:11
msgid "Average:"
msgstr "Promediu:"
-#: ../src/gnome-nettool.glade.h:12
+#: ../data/gnome-nettool.ui.h:12
msgid "Beep on ping"
msgstr "Pitar en ping"
-#: ../src/gnome-nettool.glade.h:13
+#: ../data/gnome-nettool.ui.h:13
msgid "Clear _History"
msgstr "Llimpiar _hestóricu"
-#: ../src/gnome-nettool.glade.h:14
+#: ../data/gnome-nettool.ui.h:14
msgid "Collisions:"
msgstr "Colisiones:"
-#: ../src/gnome-nettool.glade.h:15
+#: ../data/gnome-nettool.ui.h:15
msgid "Copy as text _report"
-msgstr ""
+msgstr "Copiar como info_rme de testu"
-#: ../src/gnome-nettool.glade.h:16
+#: ../data/gnome-nettool.ui.h:16
msgid "Details"
-msgstr "Detáis"
+msgstr "Detalles"
-#: ../src/gnome-nettool.glade.h:17
+#: ../data/gnome-nettool.ui.h:17
msgid "Devices"
-msgstr "Dispositivos"
+msgstr "Preseos"
-#. Dear Translator: This is the Window Title
-#: ../src/gnome-nettool.glade.h:19
+#: ../data/gnome-nettool.ui.h:18
msgid "Devices - Network Tools"
-msgstr "Dispositivos - Ferramientas de rede"
+msgstr "Preseos - Ferramientes de rede"
-#: ../src/gnome-nettool.glade.h:20
+#: ../data/gnome-nettool.ui.h:19
msgid "Display:"
msgstr "Pantalla:"
-#: ../src/gnome-nettool.glade.h:21
+#: ../data/gnome-nettool.ui.h:20
msgid "Domain address"
msgstr "Direición del dominio"
-#: ../src/gnome-nettool.glade.h:22 ../src/main.c:814
+#: ../data/gnome-nettool.ui.h:21
+msgid ""
+"Enter a domain address to lookup its whois information. For example: www."
+"domain.com or 192.168.2.1"
+msgstr ""
+"Introduz una direición de dominiu p'amosar la to información «whois».Por "
+"exemplu: www.dominiu.com o 192.168.2.1"
+
+#: ../data/gnome-nettool.ui.h:22
+msgid ""
+"Enter the network address to finger that user. For example: www.domain.com "
+"or 192.168.2.1"
+msgstr ""
+"Introduz la direición de rede pa facer finger a esi usuariu. Por exemplu: "
+"auth.dominiu.com o 192.168.2.1"
+
+#: ../data/gnome-nettool.ui.h:23
+msgid ""
+"Enter the network address to lookup. For example: www.domain.com or "
+"192.168.2.1"
+msgstr ""
+"Introduz la direición de rede pa guetar. Por exemplu: www.dominiu.com o "
+"192.168.2.1"
+
+#: ../data/gnome-nettool.ui.h:24
+msgid ""
+"Enter the network address to ping. For example: www.domain.com or 192.168.2.1"
+msgstr ""
+"Introduz la direición de rede a la que facer ping. Por exemplu: "
+"www.dominiu.com o 192.168.2.1"
+
+#: ../data/gnome-nettool.ui.h:25
+msgid ""
+"Enter the network address to scan for open ports. For example: www.domain."
+"com or 192.168.2.1"
+msgstr ""
+"Introduz una direición de rede na qu'analizar los puertos abiertos. Por "
+"exemplu: www.dominiu.com o 192.168.2.1"
+
+#: ../data/gnome-nettool.ui.h:26
+msgid ""
+"Enter the network address to trace a route to. For example: www.domain.com "
+"or 192.168.2.1"
+msgstr ""
+"Introduz la direición de rede a la que trazar una ruta. Por exemplu: "
+"www.dominiu.com o 192.168.2.1"
+
+#: ../data/gnome-nettool.ui.h:27
+msgid "Enter the user to finger"
+msgstr "Introduz l'usuariu sobro'l que facer finger"
+
+#: ../data/gnome-nettool.ui.h:28 ../src/main.c:812
msgid "Finger"
msgstr "Finger"
-#: ../src/gnome-nettool.glade.h:23
+#: ../data/gnome-nettool.ui.h:29
msgid "Finger output"
-msgstr ""
+msgstr "Salida de finger"
-#: ../src/gnome-nettool.glade.h:24
+#: ../data/gnome-nettool.ui.h:30
msgid "Hardware address:"
msgstr "Direición hardware:"
-#: ../src/gnome-nettool.glade.h:25
+#: ../data/gnome-nettool.ui.h:31
msgid "Host"
msgstr "Host"
-#: ../src/gnome-nettool.glade.h:26
+#: ../data/gnome-nettool.ui.h:32
msgid "Link speed:"
msgstr "Velocidá de conexón:"
-#: ../src/gnome-nettool.glade.h:27 ../src/main.c:734
+#: ../data/gnome-nettool.ui.h:33 ../src/main.c:732
msgid "Lookup"
-msgstr "Buscar"
+msgstr "Guetar"
-#: ../src/gnome-nettool.glade.h:28
+#: ../data/gnome-nettool.ui.h:34
msgid "Lookup output"
-msgstr ""
+msgstr "Salida de lookup"
-#: ../src/gnome-nettool.glade.h:29
+#: ../data/gnome-nettool.ui.h:35
msgid "MTU:"
msgstr "MTU:"
-#: ../src/gnome-nettool.glade.h:30
+#: ../data/gnome-nettool.ui.h:36
msgid "Maximum:"
msgstr "Másimu:"
-#: ../src/gnome-nettool.glade.h:31
+#: ../data/gnome-nettool.ui.h:37
msgid "Minimum:"
msgstr "MÃnimu:"
-#: ../src/gnome-nettool.glade.h:32
+#: ../data/gnome-nettool.ui.h:38
msgid "Multicast Information"
msgstr "Información multicast"
-#: ../src/gnome-nettool.glade.h:33
+#: ../data/gnome-nettool.ui.h:39
msgid "Multicast:"
msgstr "Multicast:"
-#: ../src/gnome-nettool.glade.h:34 ../src/main.c:446
+#: ../data/gnome-nettool.ui.h:40 ../src/main.c:446
msgid "Netstat"
msgstr "Netstat"
-#: ../src/gnome-nettool.glade.h:35
+#: ../data/gnome-nettool.ui.h:41
msgid "Netstat output"
-msgstr ""
+msgstr "Salida de netstat"
-#: ../src/gnome-nettool.glade.h:36
+#: ../data/gnome-nettool.ui.h:42
msgid "Network address"
msgstr "Direición de rede"
-#: ../src/gnome-nettool.glade.h:37
+#: ../data/gnome-nettool.ui.h:43
msgid "Not Available"
msgstr "Nun ta disponible"
-#: ../src/gnome-nettool.glade.h:38
+#: ../data/gnome-nettool.ui.h:44
msgid "Only"
msgstr "Namái"
-#: ../src/gnome-nettool.glade.h:39
+#: ../data/gnome-nettool.ui.h:45
msgid "Output for finger"
-msgstr ""
+msgstr "Salida pa finger"
-#: ../src/gnome-nettool.glade.h:40
+#: ../data/gnome-nettool.ui.h:46
msgid "Output for lookup"
-msgstr ""
+msgstr "Salida pa lookup"
-#: ../src/gnome-nettool.glade.h:41
+#: ../data/gnome-nettool.ui.h:47
msgid "Output for net stat"
-msgstr ""
+msgstr "Salida pa net stat"
-#: ../src/gnome-nettool.glade.h:42
+#: ../data/gnome-nettool.ui.h:48
msgid "Output for port scan"
-msgstr ""
+msgstr "Salida pa port scan"
-#: ../src/gnome-nettool.glade.h:43
+#: ../data/gnome-nettool.ui.h:49
msgid "Output for traceroute"
-msgstr ""
+msgstr "Salida pa traceroute"
-#: ../src/gnome-nettool.glade.h:44
+#: ../data/gnome-nettool.ui.h:50
msgid "Output for whois"
-msgstr ""
+msgstr "Salida pa whois"
-#: ../src/gnome-nettool.glade.h:45
+#: ../data/gnome-nettool.ui.h:51
msgid "Packets received:"
msgstr "Paquetes recibÃos:"
-#: ../src/gnome-nettool.glade.h:46
+#: ../data/gnome-nettool.ui.h:52
msgid "Packets transmitted:"
msgstr "Paquetes tresmitÃos:"
-#: ../src/gnome-nettool.glade.h:47 ../src/main.c:290
+#: ../data/gnome-nettool.ui.h:53 ../src/main.c:290
msgid "Ping"
msgstr "Ping"
-#: ../src/gnome-nettool.glade.h:48
+#: ../data/gnome-nettool.ui.h:54
msgid "Port Scan"
-msgstr "AnalÃs de puertos"
+msgstr "Análisis de puertos"
-#: ../src/gnome-nettool.glade.h:49
+#: ../data/gnome-nettool.ui.h:55
msgid "Port scan output"
-msgstr ""
+msgstr "Salida de port scan"
-#: ../src/gnome-nettool.glade.h:50
+#: ../data/gnome-nettool.ui.h:56
msgid "Received bytes:"
msgstr "Bytes recibÃos:"
-#: ../src/gnome-nettool.glade.h:51
+#: ../data/gnome-nettool.ui.h:57
msgid "Received packets:"
msgstr "Paquetes recibÃos:"
-#: ../src/gnome-nettool.glade.h:52
+#: ../data/gnome-nettool.ui.h:58
msgid "Reception errors:"
msgstr "Errores de receición:"
-#: ../src/gnome-nettool.glade.h:53
+#: ../data/gnome-nettool.ui.h:59
msgid "Routing Table Information"
-msgstr "Información de tables de rutas"
+msgstr "Información de tables de rutes"
-#: ../src/gnome-nettool.glade.h:54 ../src/main.c:619
+#: ../data/gnome-nettool.ui.h:60 ../src/main.c:617
msgid "Scan"
msgstr "Escanear"
-#: ../src/gnome-nettool.glade.h:55
+#: ../data/gnome-nettool.ui.h:61
msgid "Send:"
msgstr "Unviar:"
-#: ../src/gnome-nettool.glade.h:56
+#: ../data/gnome-nettool.ui.h:62
msgid "State:"
msgstr "Estáu:"
-#: ../src/gnome-nettool.glade.h:57
+#: ../data/gnome-nettool.ui.h:63
msgid "Successful packets:"
msgstr "Paquetes esitosos:"
-#: ../src/gnome-nettool.glade.h:58 ../src/main.c:375
+#: ../data/gnome-nettool.ui.h:64 ../src/main.c:375
msgid "Trace"
-msgstr "Rastrear"
+msgstr "Rastrexar"
-#: ../src/gnome-nettool.glade.h:59
+#: ../data/gnome-nettool.ui.h:65
msgid "Traceroute"
-msgstr "Rastrear ruta"
+msgstr "Rastrexar ruta"
-#: ../src/gnome-nettool.glade.h:60
+#: ../data/gnome-nettool.ui.h:66
msgid "Traceroute output"
-msgstr ""
+msgstr "Salida de traceroute"
-#: ../src/gnome-nettool.glade.h:61
+#: ../data/gnome-nettool.ui.h:67
msgid "Transmission errors:"
msgstr "Fallu de tresmisión:"
-#: ../src/gnome-nettool.glade.h:62
+#: ../data/gnome-nettool.ui.h:68
msgid "Transmitted bytes:"
msgstr "Bytes tresmitÃos:"
-#: ../src/gnome-nettool.glade.h:63
+#: ../data/gnome-nettool.ui.h:69
msgid "Transmitted packets:"
msgstr "Paquetes tresmitÃos:"
-#: ../src/gnome-nettool.glade.h:64
+#: ../data/gnome-nettool.ui.h:70
msgid "Unlimited requests"
msgstr "Solicitúes illimitaes"
-#: ../src/gnome-nettool.glade.h:65
+#: ../data/gnome-nettool.ui.h:71
msgid "User"
msgstr "Usuariu"
-#: ../src/gnome-nettool.glade.h:66
+#: ../data/gnome-nettool.ui.h:72
msgid "User name"
msgstr "Nome d'usuariu"
-#: ../src/gnome-nettool.glade.h:67 ../src/main.c:920
+#: ../data/gnome-nettool.ui.h:73 ../src/main.c:918
msgid "Whois"
msgstr "Whois"
-#: ../src/gnome-nettool.glade.h:68
+#: ../data/gnome-nettool.ui.h:74
msgid "Whois output"
-msgstr ""
+msgstr "Salida de whois"
-#: ../src/gnome-nettool.glade.h:69
+#: ../data/gnome-nettool.ui.h:75
msgid "_Configure"
msgstr "_Configurar"
-#: ../src/gnome-nettool.glade.h:70
+#: ../data/gnome-nettool.ui.h:76
msgid "_Domain address:"
msgstr "Direición del _dominiu:"
-#: ../src/gnome-nettool.glade.h:71
+#: ../data/gnome-nettool.ui.h:77
msgid "_Edit"
msgstr "E_ditar"
-#: ../src/gnome-nettool.glade.h:72
+#: ../data/gnome-nettool.ui.h:78
msgid "_Help"
-msgstr "_Aida"
+msgstr "_Ayuda"
-#: ../src/gnome-nettool.glade.h:73
+#: ../data/gnome-nettool.ui.h:79
msgid "_Information type:"
-msgstr "Tipu d' _información:"
+msgstr "Tipu d'_información:"
-#: ../src/gnome-nettool.glade.h:74
+#: ../data/gnome-nettool.ui.h:80
msgid "_Network address:"
msgstr "Direición de _rede:"
-#: ../src/gnome-nettool.glade.h:75
+#: ../data/gnome-nettool.ui.h:81
msgid "_Network device:"
-msgstr "Dispositivu de _rede:"
+msgstr "Preséu de _rede:"
-#: ../src/gnome-nettool.glade.h:76
+#: ../data/gnome-nettool.ui.h:82
msgid "_Tool"
msgstr "_Ferramienta"
-#: ../src/gnome-nettool.glade.h:77
+#: ../data/gnome-nettool.ui.h:83
msgid "_Username:"
msgstr "_Usuariu:"
-#. Translators: this is the abbreviation for milliseconds
-#: ../src/gnome-nettool.glade.h:79
+#: ../data/gnome-nettool.ui.h:84
msgid "ms"
msgstr "ms"
-#: ../src/gnome-nettool.glade.h:80
+#: ../data/gnome-nettool.ui.h:85
msgid "requests"
msgstr "solicitúes"
@@ -400,115 +483,115 @@ msgstr "Interfaz desconocÃu"
#: ../src/info.c:165
msgid "Network Devices Not Found"
-msgstr "Nun s'atopen dispositivos de rede"
+msgstr "Nun s'atopen preseos de rede"
-#: ../src/info.c:392 ../src/info.c:395
+#: ../src/info.c:400 ../src/info.c:403
msgid "Unknown"
msgstr "DesconocÃu"
-#: ../src/info.c:466
+#: ../src/info.c:474
msgid "Active"
msgstr "Activu"
-#: ../src/info.c:468
+#: ../src/info.c:476
msgid "Inactive"
msgstr "Inactivu"
-#: ../src/info.c:473
+#: ../src/info.c:481
msgid "Loopback"
msgstr "Bucle llocal"
-#: ../src/info.c:482
+#: ../src/info.c:490
msgid "Enabled"
msgstr "Habilitáu"
-#: ../src/info.c:484
+#: ../src/info.c:492
msgid "Disabled"
msgstr "Deshabilitáu"
#. The info output in a text format (to copy on clipboard)
-#: ../src/info.c:573
+#: ../src/info.c:581
#, c-format
msgid "Network device:\t%s\n"
-msgstr "Dispositivu de rede:\t%s\n"
+msgstr "Preséu de rede:\t%s\n"
-#: ../src/info.c:574
+#: ../src/info.c:582
#, c-format
msgid "Hardware address:\t%s\n"
msgstr "Direición hardware:\t%s\n"
-#: ../src/info.c:575
+#: ../src/info.c:583
#, c-format
msgid "Multicast:\t%s\n"
msgstr "Multicast:\t%s\n"
-#: ../src/info.c:576
+#: ../src/info.c:584
#, c-format
msgid "MTU:\t%s\n"
msgstr "MTU:\t%s\n"
-#: ../src/info.c:577
+#: ../src/info.c:585
#, c-format
msgid "Link speed:\t%s\n"
msgstr "Velocidá del enllaz:\t%s\n"
-#: ../src/info.c:578
+#: ../src/info.c:586
#, c-format
msgid "State:\t%s\n"
msgstr "Estáu:\t%s\n"
-#: ../src/info.c:580
+#: ../src/info.c:588
#, c-format
msgid "Transmitted packets:\t%s\n"
msgstr "Paquetes tresmitÃos:\t%s\n"
-#: ../src/info.c:581
+#: ../src/info.c:589
#, c-format
msgid "Transmission errors:\t%s\n"
msgstr "Fallos de tresmisión:\t%s\n"
-#: ../src/info.c:582
+#: ../src/info.c:590
#, c-format
msgid "Received packets:\t%s\n"
msgstr "Paquetes recibÃos:\t%s\n"
-#: ../src/info.c:583
+#: ../src/info.c:591
#, c-format
msgid "Reception errors:\t%s\n"
msgstr "Fallos de receición:\t%s\n"
-#: ../src/info.c:584
+#: ../src/info.c:592
#, c-format
msgid "Collisions:\t%s\n"
msgstr "Choques:\t%s\n"
-#: ../src/info.h:27
+#: ../src/info.h:24
msgid "not available"
-msgstr "nun ta afayaÃzu/a"
+msgstr "nun ta disponible"
-#: ../src/lookup.c:80
+#: ../src/lookup.c:85
#, c-format
msgid "Looking up %s"
msgstr "Buscando %s"
-#: ../src/lookup.c:278
+#: ../src/lookup.c:279
msgid "Name"
msgstr "Nome"
#. Time To Live of a hostname in a name server
-#: ../src/lookup.c:287
+#: ../src/lookup.c:288
msgid "TTL"
msgstr "TTL"
-#: ../src/lookup.c:296
+#: ../src/lookup.c:297
msgid "Address Type"
msgstr "Tipu de direición"
-#: ../src/lookup.c:306
+#: ../src/lookup.c:307
msgid "Record Type"
msgstr "Tipu de rexistru"
-#: ../src/lookup.c:315
+#: ../src/lookup.c:316
msgid "Address"
msgstr "Direición"
@@ -518,74 +601,74 @@ msgstr "Direición"
#. Record Type (A, PTR, HINFO, NS, TXT, etc.),
#. Resolution (results of the query)
#. It's a tabular output, and these belongs to the column titles
-#: ../src/lookup.c:343
+#: ../src/lookup.c:344
msgid "Source\tTTL\tAddress Type\tRecord Type1\tResolution\n"
msgstr "Orixe\tTTL\tTipu de direición\tRexistru Tipu1\tResolución\n"
-#: ../src/main.c:83
+#: ../src/main.c:82
msgid "Load information for a network device"
-msgstr "Cargar información pa un dispositivu de rede"
+msgstr "Cargar información pa un preséu de rede"
-#: ../src/main.c:84
+#: ../src/main.c:83
msgid "DEVICE"
-msgstr "DISPOSITIVU"
+msgstr "PRESÃ?U"
-#: ../src/main.c:87
+#: ../src/main.c:86
msgid "Send a ping to a network address"
msgstr "Unviar un ping a una direición de rede"
-#: ../src/main.c:88 ../src/main.c:96 ../src/main.c:100 ../src/main.c:104
+#: ../src/main.c:87 ../src/main.c:95 ../src/main.c:99 ../src/main.c:103
msgid "HOST"
msgstr "HOST"
-#: ../src/main.c:91
+#: ../src/main.c:90
msgid "Get netstat information. Valid options are: route, active, multicast."
msgstr ""
"Garrar información netstat. Les opciones que valen son: route, active, "
"multicast."
-#: ../src/main.c:92
+#: ../src/main.c:91
msgid "COMMAND"
msgstr "COMANDU"
-#: ../src/main.c:95
+#: ../src/main.c:94
msgid "Trace a route to a network address"
-msgstr "Rastrear una ruta a una direición de rede"
+msgstr "Rastrexar una ruta a una direición de rede"
-#: ../src/main.c:99
+#: ../src/main.c:98
msgid "Port scan a network address"
-msgstr "AnalÃs de puertos d'una direición de rede"
+msgstr "Análisis de puertos d'una direición de rede"
-#: ../src/main.c:103
+#: ../src/main.c:102
msgid "Look up a network address"
msgstr "Resolver una direición de rede"
-#: ../src/main.c:107
+#: ../src/main.c:106
msgid "Finger command to run"
msgstr "Comandu finger pa executar"
-#: ../src/main.c:108
+#: ../src/main.c:107
msgid "USER"
msgstr "USUARIU"
-#: ../src/main.c:111
+#: ../src/main.c:110
msgid "Perform a whois lookup for a network domain"
msgstr "Facer una busca whois pa un dominiu de rede"
-#: ../src/main.c:112
+#: ../src/main.c:111
msgid "DOMAIN"
msgstr "DOMINIU"
-#: ../src/main.c:129
+#: ../src/main.c:130
#, c-format
msgid ""
"The file %s doesn't exist, please check if gnome-nettool is correctly "
"installed"
msgstr ""
-"El ficheru %s nun esiste, comprebe que gnome-nettool s'alcuentra instaláu "
-"correchamente"
+"El ficheru %s nun esiste, comprueba que gnome-nettool s'alcuentra instaláu "
+"correcho"
-#: ../src/main.c:482 ../src/netstat.c:443
+#: ../src/main.c:482 ../src/netstat.c:455
msgid "Protocol"
msgstr "Protocolu"
@@ -595,7 +678,7 @@ msgstr "Direición IP"
#: ../src/main.c:496
msgid "Netmask / Prefix"
-msgstr "Máscara de rede /prefixu"
+msgstr "Mázcara de rede /prefixu"
#: ../src/main.c:503
msgid "Broadcast"
@@ -605,192 +688,192 @@ msgstr "Difusión"
msgid "Scope"
msgstr "Ã?mbitu"
-#: ../src/main.c:669
+#: ../src/main.c:667
msgid "Default Information"
msgstr "Información predeterminao"
-#: ../src/main.c:670
+#: ../src/main.c:668
msgid "Internet Address"
msgstr "Direición d'Internet"
-#: ../src/main.c:671
+#: ../src/main.c:669
msgid "Canonical Name"
msgstr "Nome canónicu"
-#: ../src/main.c:672
+#: ../src/main.c:670
msgid "CPU / OS Type"
msgstr "Tipu de CPU / SO"
#. When asking for MX record in DNS context
-#: ../src/main.c:674
+#: ../src/main.c:672
msgid "Mailbox Exchange"
msgstr "Buzón de corréu Exchange"
-#: ../src/main.c:675
+#: ../src/main.c:673
msgid "Mailbox Information"
msgstr "Información del buzón de corréu"
#. When asking for NS record in DNS context
-#: ../src/main.c:677
+#: ../src/main.c:675
msgid "Name Server"
-msgstr "Nome del servidor"
+msgstr "Nome del sirvidor"
-#: ../src/main.c:678
+#: ../src/main.c:676
msgid "Host name for Address"
-msgstr "Nome del servidor pa la direición"
+msgstr "Nome del sirvidor pa la direición"
-#: ../src/main.c:679
+#: ../src/main.c:677
msgid "Start-of-authority"
msgstr "Autoridá de la zona (SAO)"
-#: ../src/main.c:680
+#: ../src/main.c:678
msgid "Text Information"
msgstr "Información de testu"
-#: ../src/main.c:681
+#: ../src/main.c:679
msgid "Well Known Services"
msgstr "Servicios conocÃos"
-#: ../src/main.c:682
+#: ../src/main.c:680
msgid "Any / All Information"
msgstr "Cualesquier / tola información"
-#: ../src/netstat.c:122
+#: ../src/netstat.c:134
msgid "Getting routing table"
msgstr "Obteniendo la tabla de rutes"
-#: ../src/netstat.c:137
+#: ../src/netstat.c:149
msgid "Getting active Internet connections"
msgstr "Obteniendo conexones a Internet actives"
-#: ../src/netstat.c:146
+#: ../src/netstat.c:158
msgid "Getting group memberships"
msgstr "Obteniendo miembros de grupu"
-#: ../src/netstat.c:450
+#: ../src/netstat.c:462
msgid "IP Source"
msgstr "IP d'orixe"
-#: ../src/netstat.c:458
+#: ../src/netstat.c:470
msgid "Port/Service"
msgstr "Puertu/Serviciu"
-#: ../src/netstat.c:466 ../src/scan.c:314
+#: ../src/netstat.c:478 ../src/scan.c:318
msgid "State"
msgstr "Estáu"
-#: ../src/netstat.c:609
+#: ../src/netstat.c:632
msgid "Destination/Prefix"
msgstr "DestÃn/prefixu"
-#: ../src/netstat.c:611
+#: ../src/netstat.c:634
msgid "Destination"
msgstr "DestÃn"
-#: ../src/netstat.c:618
+#: ../src/netstat.c:641
msgid "Gateway"
msgstr "Puerta d'enllaz"
-#: ../src/netstat.c:626
+#: ../src/netstat.c:649
msgid "Netmask"
-msgstr "Máscara de rede"
+msgstr "Mázcara de rede"
-#: ../src/netstat.c:634 ../src/netstat.c:741
+#: ../src/netstat.c:657 ../src/netstat.c:764
msgid "Interface"
msgstr "Interfaz"
-#: ../src/netstat.c:748
+#: ../src/netstat.c:771
msgid "Member"
msgstr "Miembru"
-#: ../src/netstat.c:756
+#: ../src/netstat.c:779
msgid "Group"
msgstr "Grupu"
#. The netstat "Display active network services" output in
#. text format.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/netstat.c:798
+#: ../src/netstat.c:821
msgid "Protocol\tIP Source\tPort/Service\tState\n"
msgstr "Protocolu\tIP orixe\tPuertu/serviciu\tEstáu\n"
#. The netstat "Display routing" output in text format.
#. This seems as a route table.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/netstat.c:804
+#: ../src/netstat.c:827
msgid "Destination\tGateway\tNetmask\tInterface\n"
-msgstr "DestÃn\tPuertaenllaz\tMáscara\tInterfaz\n"
+msgstr "DestÃn\tPuertaenllaz\tMázcara\tInterfaz\n"
#. The netstat "Multicast information" output in text format.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/netstat.c:809
+#: ../src/netstat.c:832
msgid "Interface\tMember\tGroup\n"
msgstr "Interfaz\tMiembru\tGrupu\n"
-#: ../src/nettool.c:199
+#: ../src/nettool.c:204
msgid "A network address was not specified"
msgstr "Nun s'especificó una direición de rede"
-#: ../src/nettool.c:200 ../src/nettool.c:209
+#: ../src/nettool.c:205 ../src/nettool.c:214
msgid "Please enter a valid network address and try again."
-msgstr "Introduza la direición de rede válida ya téntelo de nuevu."
+msgstr "Introduz la direición de rede válida ya inténtalo de nuevu."
-#: ../src/nettool.c:207
+#: ../src/nettool.c:212
#, c-format
msgid "The address '%s' cannot be found"
msgstr "La direición «%s» nun se pue alcontrar"
-#: ../src/nettool.c:236
+#: ../src/nettool.c:241
msgid "A domain address was not specified"
msgstr "Nun s'especificó una direición de dominiu"
-#: ../src/nettool.c:237
+#: ../src/nettool.c:242
msgid "Please enter a valid domain address and try again."
-msgstr "Introduza una direición de dominiu válida ya téntelo otra vegada."
+msgstr "Introduz una direición de dominiu válida ya inténtalo otra vegada."
-#: ../src/nettool.c:406
+#: ../src/nettool.c:433
msgid "Information not available"
msgstr "Información non disponible"
-#: ../src/nettool.c:526
+#: ../src/nettool.c:553
msgid "Stop"
msgstr "Detener"
-#: ../src/nettool.c:532
+#: ../src/nettool.c:559
msgid "Run"
msgstr "Executar"
#. Created up here so we can get the geometry info.
-#: ../src/ping.c:151
+#: ../src/ping.c:155
msgid "Time (ms):"
msgstr "Tiempu (ms):"
-#: ../src/ping.c:171
+#: ../src/ping.c:176
msgid "Seq. No.:"
-msgstr "Nº de sec:"
+msgstr "Náµ? de sec:"
-#: ../src/ping.c:254
+#: ../src/ping.c:261
#, c-format
msgid "Sending ping requests to %s"
msgstr "Unviando solicitúes ping a %s"
-#: ../src/ping.c:569
+#: ../src/ping.c:577
msgid "Bytes"
msgstr "Bytes"
-#: ../src/ping.c:576
+#: ../src/ping.c:584
msgid "Source"
msgstr "Orixe"
-#: ../src/ping.c:584
+#: ../src/ping.c:592
msgid "Seq"
msgstr "Secuencia"
-#: ../src/ping.c:594
+#: ../src/ping.c:602
msgid "Time"
msgstr "Tiempu"
-#: ../src/ping.c:602
+#: ../src/ping.c:610
msgid "Units"
msgstr "Unidaes"
@@ -798,92 +881,92 @@ msgstr "Unidaes"
#. Bytes received, Address Source, Number of Sequence,
#. Round Trip Time (Time), Units of Time.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/ping.c:628
+#: ../src/ping.c:636
msgid "Bytes\tSource\tSeq\tTime\tUnits\n"
msgstr "Bytes\tOrixe\tSec.\tHora\tUnidaes\n"
#. The ping output in a text format (to copy on clipboard)
-#: ../src/ping.c:643
+#: ../src/ping.c:651
#, c-format
msgid "Time minimum:\t%s ms\n"
msgstr "Tiempu mÃnimu:\t%s ms\n"
-#: ../src/ping.c:644
+#: ../src/ping.c:652
#, c-format
msgid "Time average:\t%s ms\n"
msgstr "Tiempu mediu:\t%s ms\n"
-#: ../src/ping.c:645
+#: ../src/ping.c:653
#, c-format
msgid "Time maximum:\t%s ms\n"
msgstr "Tiempu másimu:\t%s ms\n"
-#: ../src/ping.c:647
+#: ../src/ping.c:655
#, c-format
msgid "Packets transmitted:\t%s\n"
msgstr "Paquetes tresmitÃos:\t%s\n"
-#: ../src/ping.c:649
+#: ../src/ping.c:657
#, c-format
msgid "Packets received:\t%s\n"
msgstr "Paquetes recibÃos:\t%s\n"
-#: ../src/ping.c:652
+#: ../src/ping.c:660
#, c-format
msgid "Successful packets:\t%s\n"
msgstr "Paquetes esitosos:\t%s\n"
-#: ../src/scan.c:94
+#: ../src/scan.c:98
#, c-format
msgid "Scanning %s for open ports"
msgstr "Analizando los puertos abiertos de %s"
-#: ../src/scan.c:169
+#: ../src/scan.c:173
msgid "unknown"
msgstr "desconocÃu"
#. Translators: "open" is a network status and should be one word.
-#: ../src/scan.c:173
+#: ../src/scan.c:177
msgid "open"
msgstr "abrir"
-#: ../src/scan.c:306
+#: ../src/scan.c:310
msgid "Port"
msgstr "Puertu"
-#: ../src/scan.c:322
+#: ../src/scan.c:326
msgid "Service"
msgstr "Serviciu"
#. The portscan output in text format:
#. Port, State, Service.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/scan.c:344
+#: ../src/scan.c:348
msgid "Port\tState\tService\n"
msgstr "Puertu\tEstáu\tServiciu\n"
-#: ../src/traceroute.c:62
+#: ../src/traceroute.c:66
#, c-format
msgid "Tracing route to %s"
msgstr "Trazando ruta a %s"
-#: ../src/traceroute.c:265
+#: ../src/traceroute.c:269
msgid "Hop"
msgstr "Saltos"
-#: ../src/traceroute.c:273
+#: ../src/traceroute.c:277
msgid "Hostname"
msgstr "Nome de host"
-#: ../src/traceroute.c:281
+#: ../src/traceroute.c:285
msgid "IP"
msgstr "IP"
-#: ../src/traceroute.c:292
+#: ../src/traceroute.c:296
msgid "Time 1"
msgstr "Tiempu 1"
-#: ../src/traceroute.c:302
+#: ../src/traceroute.c:306
msgid "Time 2"
msgstr "Tiempu 2"
@@ -891,33 +974,29 @@ msgstr "Tiempu 2"
#. Hop count, Hostname, IP, Round Trip Time 1 (Time1),
#. Round Trip Time 2 (Time2),
#. It's a tabular output, and these belongs to the column titles
-#: ../src/traceroute.c:328
+#: ../src/traceroute.c:332
msgid "Hop\tHostname\tIP\tTime 1\tTime 2\n"
msgstr "Saltu\thost\tIP\tTiempu1\tTiempu 2\n"
-#: ../src/utils.c:227
+#: ../src/utils.c:231
#, c-format
msgid ""
"In order to use this feature of the program, %s must be installed in your "
"system"
msgstr ""
-"Pa usar esta carauterÃstica del programa, tien d'instalase %s nel so sistema"
-
-#: ../src/gnome-nettool.desktop.in.in.h:2
-msgid "View information about your network"
-msgstr "Ver información sobro la so rede"
+"Pa usar esta carauterÃstica del programa, tien d'instalase %s nel sistema"
-#: ../src/finger.c:63
+#: ../src/finger.c:66
#, c-format
msgid "Getting information of %s on \"%s\""
msgstr "Obteniendo la información de %s en «%s»"
-#: ../src/finger.c:67
+#: ../src/finger.c:70
#, c-format
msgid "Getting information of all users on \"%s\""
msgstr "Obteniendo la información de tolos usuarios en «%s»"
-#: ../src/whois.c:58
+#: ../src/whois.c:62
#, c-format
msgid "Getting the whois information of %s"
msgstr "Obteniendo la información whois de %s"
diff -pruN 3.0.0-2/po/be.po 3.0.1-0ubuntu1/po/be.po
--- 3.0.0-2/po/be.po 1970-01-01 00:00:00.000000000 +0000
+++ 3.0.1-0ubuntu1/po/be.po 2011-12-31 23:54:24.000000000 +0000
@@ -0,0 +1,991 @@
+# Iryna Nikanchuk <defragbrain gmail com>, 2009.
+# Yuri Matsuk <yuri matsuk net>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnome-nettool.master\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-16 02:02+0300\n"
+"PO-Revision-Date: 2011-11-16 02:02+0300\n"
+"Last-Translator: Yuri Matsuk <yuri matsuk net>\n"
+"Language-Team: Belarusian <i18n-bel-gnome googlegroups com>\n"
+"Language: be\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-10-28 07:24+0000\n"
+"X-Generator: Launchpad (build 14197)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: ../src/callbacks.c:332
+msgid "translator-credits"
+msgstr ""
+"Iryna Nikanchuk <defragbrain gmail com>\n"
+"Yuri Matsuk <yuri matsuk net>"
+
+#. Translators: %s is the name of the copyright holder
+#: ../src/callbacks.c:339
+#, c-format
+msgid "Copyright © 2003-2008 %s"
+msgstr "Ð?Ñ?Ñ?аÑ?Ñ?кÑ?Ñ? пÑ?авÑ? © 2003-2008 %s"
+
+#. Dear translator: This is the name of the application
+#: ../src/callbacks.c:343 ../src/callbacks.c:344
+#: ../data/gnome-nettool.desktop.in.in.h:1
+msgid "Network Tools"
+msgstr "СеÑ?кавÑ?Ñ? пÑ?Ñ?ладÑ?"
+
+#: ../src/callbacks.c:346
+msgid "Graphical user interface for common network utilities"
+msgstr "Ð?Ñ?аÑ?Ñ?Ñ?нÑ? Ñ?нÑ?Ñ?Ñ?Ñ?ейÑ? каÑ?Ñ?Ñ?Ñ?алÑ?нÑ?ка длÑ? папÑ?лÑ?Ñ?нÑ?Ñ? Ñ?еÑ?кавÑ?Ñ? пÑ?Ñ?лад"
+
+#: ../src/callbacks.c:458 ../src/main.c:142 ../src/nettool.c:488
+msgid "Idle"
+msgstr "Ð?Ñ?здзейнаÑ?Ñ?Ñ?"
+
+#. Dear Translator: This is the Window Title. 'Network Tools' is the
+#. * name of the application
+#: ../src/callbacks.c:463
+#, c-format
+msgid "%s - Network Tools"
+msgstr "%s - СеÑ?кавÑ?Ñ? пÑ?Ñ?ладÑ?"
+
+#: ../src/callbacks.c:487
+msgid "Unable to open help file"
+msgstr "Ð?е Ñ?далоÑ?Ñ? адкÑ?Ñ?Ñ?Ñ? даведаÑ?нÑ? Ñ?айл"
+
+#: ../data/gnome-nettool.desktop.in.in.h:2
+msgid "View information about your network"
+msgstr "Ð?Ñ?аглÑ?д звеÑ?Ñ?ак пÑ?а ваÑ?Ñ? Ñ?еÑ?кÑ?"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:1
+msgid "A list of domains previously used"
+msgstr "СпÑ?Ñ? папÑ?Ñ?Ñ?днÑ?Ñ? даменаÑ?"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:2
+msgid "A list of hostnames previously used"
+msgstr "СпÑ?Ñ? папÑ?Ñ?Ñ?днÑ?Ñ? назваÑ? маÑ?Ñ?н"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:3
+msgid "A list of usernames previously used"
+msgstr "СпÑ?Ñ? папÑ?Ñ?Ñ?днÑ?Ñ? Ñ?мÑ?наÑ? каÑ?Ñ?Ñ?Ñ?алÑ?нÑ?каÑ?"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:4
+msgid "Historically used domains"
+msgstr "Раней вÑ?каÑ?Ñ?Ñ?Ñ?анÑ?Ñ? даменÑ?"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:5
+msgid "Historically used hostnames"
+msgstr "Раней вÑ?каÑ?Ñ?Ñ?Ñ?анÑ?Ñ? назвÑ? маÑ?Ñ?н"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:6
+msgid "Historically used usernames"
+msgstr "Раней вÑ?каÑ?Ñ?Ñ?Ñ?анÑ?Ñ? Ñ?мÑ?нÑ? каÑ?Ñ?Ñ?Ñ?алÑ?нÑ?каÑ?"
+
+#: ../data/gnome-nettool.ui.h:1
+msgid "0"
+msgstr "0"
+
+#: ../data/gnome-nettool.ui.h:3
+#, no-c-format
+msgid "0%"
+msgstr "0%"
+
+#: ../data/gnome-nettool.ui.h:4
+msgid "0.0"
+msgstr "0.0"
+
+#: ../data/gnome-nettool.ui.h:5
+msgid "<b>IP Information</b>"
+msgstr "<b>Ð?веÑ?Ñ?кÑ? пÑ?а IP</b>"
+
+#: ../data/gnome-nettool.ui.h:6
+msgid "<b>Interface Information</b>"
+msgstr "<b>Ð?веÑ?Ñ?кÑ? аб Ñ?нÑ?Ñ?Ñ?Ñ?ейÑ?е</b>"
+
+#: ../data/gnome-nettool.ui.h:7
+msgid "<b>Interface Statistics</b>"
+msgstr "<b>СÑ?аÑ?Ñ?Ñ?Ñ?Ñ?ка Ñ?нÑ?Ñ?Ñ?Ñ?ейÑ?Ñ?</b>"
+
+#: ../data/gnome-nettool.ui.h:8
+msgid "<b>Round Trip Time Statistics</b>"
+msgstr "<b>СÑ?аÑ?Ñ?Ñ?Ñ?Ñ?ка заÑ?Ñ?Ñ?мак (RTT)</b>"
+
+#: ../data/gnome-nettool.ui.h:9
+msgid "<b>Transmission Statistics</b>"
+msgstr "<b>СÑ?аÑ?Ñ?Ñ?Ñ?Ñ?ка пеÑ?адаÑ?Ñ?</b>"
+
+#: ../data/gnome-nettool.ui.h:10
+msgid "Active Network Services"
+msgstr "Ð?кÑ?Ñ?Ñ?нÑ?Ñ? Ñ?еÑ?кавÑ?Ñ? Ñ?лÑ?жбÑ?"
+
+#: ../data/gnome-nettool.ui.h:11
+msgid "Average:"
+msgstr "СÑ?Ñ?Ñ?днÑ?е:"
+
+#: ../data/gnome-nettool.ui.h:12
+msgid "Beep on ping"
+msgstr "Ð?Ñ?кавÑ? Ñ?Ñ?гнал пÑ?Ñ? запÑ?Ñ?е ping"
+
+#: ../data/gnome-nettool.ui.h:13
+msgid "Clear _History"
+msgstr "Ð?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? _гÑ?Ñ?Ñ?оÑ?Ñ?Ñ?"
+
+#: ../data/gnome-nettool.ui.h:14
+msgid "Collisions:"
+msgstr "Ð?алÑ?зÑ?й:"
+
+#: ../data/gnome-nettool.ui.h:15
+msgid "Copy as text _report"
+msgstr "СкапÑ?Ñ?аваÑ?Ñ? Ñ?к Ñ?Ñ?кÑ?Ñ?авÑ?Ñ? _Ñ?пÑ?аваздаÑ?Ñ?"
+
+#: ../data/gnome-nettool.ui.h:16
+msgid "Details"
+msgstr "Ð?адÑ?абÑ?знаÑ?Ñ?Ñ?"
+
+#: ../data/gnome-nettool.ui.h:17
+msgid "Devices"
+msgstr "Ð?Ñ?Ñ?Ñ?Ñ?аÑ?аваннÑ?"
+
+#: ../data/gnome-nettool.ui.h:18
+msgid "Devices - Network Tools"
+msgstr "Ð?Ñ?Ñ?Ñ?Ñ?аÑ?аваннÑ? - СеÑ?кавÑ?Ñ? пÑ?Ñ?ладÑ?"
+
+#: ../data/gnome-nettool.ui.h:19
+msgid "Display:"
+msgstr "Ð?аказаÑ?Ñ?:"
+
+#: ../data/gnome-nettool.ui.h:20
+msgid "Domain address"
+msgstr "Ð?аменнÑ? адÑ?аÑ?"
+
+#: ../data/gnome-nettool.ui.h:21
+msgid ""
+"Enter a domain address to lookup its whois information. For example: www."
+"domain.com or 192.168.2.1"
+msgstr ""
+"УвÑ?дзÑ?Ñ?е даменнÑ? адÑ?аÑ? длÑ? поÑ?Ñ?кÑ? whois-звеÑ?Ñ?ак аб Ñ?м. Ð?апÑ?Ñ?клад: www.domain."
+"com Ñ?Ñ? 192.168.2.1"
+
+#: ../data/gnome-nettool.ui.h:22
+msgid ""
+"Enter the network address to finger that user. For example: www.domain.com "
+"or 192.168.2.1"
+msgstr ""
+"УвÑ?дзÑ?Ñ?е Ñ?еÑ?кавÑ? адÑ?аÑ? длÑ? finger-апÑ?Ñ?аннÑ? гÑ?Ñ?ага каÑ?Ñ?Ñ?Ñ?алÑ?нÑ?ка. Ð?апÑ?Ñ?клад: "
+"www.domain.com Ñ?Ñ? 192.168.2.1"
+
+#: ../data/gnome-nettool.ui.h:23
+msgid ""
+"Enter the network address to lookup. For example: www.domain.com or "
+"192.168.2.1"
+msgstr ""
+"УвÑ?дзÑ?Ñ?е Ñ?еÑ?кавÑ? адÑ?аÑ? длÑ? поÑ?Ñ?кÑ?. Ð?апÑ?Ñ?клад: www.domain.com Ñ?Ñ? 192.168.2.1"
+
+#: ../data/gnome-nettool.ui.h:24
+msgid ""
+"Enter the network address to ping. For example: www.domain.com or 192.168.2.1"
+msgstr ""
+"УвÑ?дзÑ?Ñ?е Ñ?еÑ?кавÑ? адÑ?аÑ? длÑ? пÑ?нгаваннÑ?. Ð?апÑ?Ñ?клад: www.domain.com Ñ?Ñ? "
+"192.168.2.1"
+
+#: ../data/gnome-nettool.ui.h:25
+msgid ""
+"Enter the network address to scan for open ports. For example: www.domain."
+"com or 192.168.2.1"
+msgstr ""
+"УвÑ?дзÑ?Ñ?е Ñ?еÑ?кавÑ? адÑ?аÑ? длÑ? Ñ?канаваннÑ? адкÑ?Ñ?Ñ?Ñ?Ñ? паÑ?Ñ?оÑ?. Ð?апÑ?Ñ?клад: www.domain."
+"com Ñ?Ñ? 192.168.2.1"
+
+#: ../data/gnome-nettool.ui.h:26
+msgid ""
+"Enter the network address to trace a route to. For example: www.domain.com "
+"or 192.168.2.1"
+msgstr ""
+"УвÑ?дзÑ?Ñ?е Ñ?еÑ?кавÑ? адÑ?аÑ? длÑ? Ñ?Ñ?аÑ?Ñ?Ñ?аваннÑ? маÑ?Ñ?Ñ?Ñ?Ñ?Ñ?. Ð?апÑ?Ñ?клад: www.domain.com "
+"Ñ?Ñ? 192.168.2.1"
+
+#: ../data/gnome-nettool.ui.h:27
+msgid "Enter the user to finger"
+msgstr "УвÑ?дзÑ?Ñ?е Ñ?мÑ? каÑ?Ñ?Ñ?Ñ?алÑ?нÑ?ка длÑ? finger-апÑ?Ñ?аннÑ?"
+
+#: ../data/gnome-nettool.ui.h:28 ../src/main.c:812
+msgid "Finger"
+msgstr "Finger"
+
+#: ../data/gnome-nettool.ui.h:29
+msgid "Finger output"
+msgstr "Ð?Ñ?вад finger"
+
+#: ../data/gnome-nettool.ui.h:30
+msgid "Hardware address:"
+msgstr "Ð?паÑ?аÑ?нÑ? адÑ?аÑ?:"
+
+#: ../data/gnome-nettool.ui.h:31
+msgid "Host"
+msgstr "Ð?аÑ?Ñ?на"
+
+#: ../data/gnome-nettool.ui.h:32
+msgid "Link speed:"
+msgstr "Ð¥Ñ?Ñ?каÑ?Ñ?Ñ? злÑ?Ñ?Ñ?ннÑ?:"
+
+#: ../data/gnome-nettool.ui.h:33 ../src/main.c:732
+msgid "Lookup"
+msgstr "Ð?оÑ?Ñ?к"
+
+#: ../data/gnome-nettool.ui.h:34
+msgid "Lookup output"
+msgstr "Ð?Ñ?нÑ?кÑ? поÑ?Ñ?кÑ?"
+
+#: ../data/gnome-nettool.ui.h:35
+msgid "MTU:"
+msgstr "MTU:"
+
+#: ../data/gnome-nettool.ui.h:36
+msgid "Maximum:"
+msgstr "Ð?акÑ?Ñ?мÑ?м:"
+
+#: ../data/gnome-nettool.ui.h:37
+msgid "Minimum:"
+msgstr "Ð?Ñ?нÑ?мÑ?м:"
+
+#: ../data/gnome-nettool.ui.h:38
+msgid "Multicast Information"
+msgstr "Ð?веÑ?Ñ?кÑ? аб мÑ?лÑ?Ñ?Ñ?каÑ?Ñ?-Ñ?Ñ?анÑ?лÑ?Ñ?Ñ?Ñ?"
+
+#: ../data/gnome-nettool.ui.h:39
+msgid "Multicast:"
+msgstr "Ð?Ñ?лÑ?Ñ?Ñ?каÑ?Ñ?:"
+
+#: ../data/gnome-nettool.ui.h:40 ../src/main.c:446
+msgid "Netstat"
+msgstr "Netstat"
+
+#: ../data/gnome-nettool.ui.h:41
+msgid "Netstat output"
+msgstr "Ð?Ñ?вад netstat"
+
+#: ../data/gnome-nettool.ui.h:42
+msgid "Network address"
+msgstr "СеÑ?кавÑ? адÑ?аÑ?"
+
+#: ../data/gnome-nettool.ui.h:43
+msgid "Not Available"
+msgstr "Ð?едаÑ?Ñ?Ñ?пна"
+
+#: ../data/gnome-nettool.ui.h:44
+msgid "Only"
+msgstr "ТолÑ?кÑ?"
+
+#: ../data/gnome-nettool.ui.h:45
+msgid "Output for finger"
+msgstr "Ð?Ñ?вад finger"
+
+#: ../data/gnome-nettool.ui.h:46
+msgid "Output for lookup"
+msgstr "Ð?Ñ?вад lookup"
+
+#: ../data/gnome-nettool.ui.h:47
+msgid "Output for net stat"
+msgstr "Ð?Ñ?вад net stat"
+
+#: ../data/gnome-nettool.ui.h:48
+msgid "Output for port scan"
+msgstr "Ð?Ñ?вад Ñ?канаваннÑ? паÑ?Ñ?оÑ?"
+
+#: ../data/gnome-nettool.ui.h:49
+msgid "Output for traceroute"
+msgstr "Ð?Ñ?вад traceroute"
+
+#: ../data/gnome-nettool.ui.h:50
+msgid "Output for whois"
+msgstr "Ð?Ñ?вад whois"
+
+#: ../data/gnome-nettool.ui.h:51
+msgid "Packets received:"
+msgstr "Ð?Ñ?Ñ?Ñ?мана пакеÑ?аÑ?:"
+
+#: ../data/gnome-nettool.ui.h:52
+msgid "Packets transmitted:"
+msgstr "Ð?еÑ?ададзена пакеÑ?аÑ?:"
+
+#: ../data/gnome-nettool.ui.h:53 ../src/main.c:290
+msgid "Ping"
+msgstr "Ping"
+
+#: ../data/gnome-nettool.ui.h:54
+msgid "Port Scan"
+msgstr "Сканаванне паÑ?Ñ?оÑ?"
+
+#: ../data/gnome-nettool.ui.h:55
+msgid "Port scan output"
+msgstr "Ð?Ñ?вад Ñ?канаваннÑ? паÑ?Ñ?оÑ?"
+
+#: ../data/gnome-nettool.ui.h:56
+msgid "Received bytes:"
+msgstr "Ð?Ñ?Ñ?Ñ?мана байÑ?аÑ?:"
+
+#: ../data/gnome-nettool.ui.h:57
+msgid "Received packets:"
+msgstr "Ð?Ñ?Ñ?Ñ?мана пакеÑ?аÑ?:"
+
+#: ../data/gnome-nettool.ui.h:58
+msgid "Reception errors:"
+msgstr "Ð?амÑ?лак пÑ?Ñ?Ñ?мÑ?:"
+
+#: ../data/gnome-nettool.ui.h:59
+msgid "Routing Table Information"
+msgstr "Ð?веÑ?Ñ?кÑ? аб Ñ?аблÑ?Ñ?Ñ? маÑ?Ñ?Ñ?Ñ?Ñ?Ñ?заÑ?Ñ?Ñ?"
+
+#: ../data/gnome-nettool.ui.h:60 ../src/main.c:617
+msgid "Scan"
+msgstr "СканаваÑ?Ñ?"
+
+#: ../data/gnome-nettool.ui.h:61
+msgid "Send:"
+msgstr "Ð?аÑ?лаÑ?Ñ?:"
+
+#: ../data/gnome-nettool.ui.h:62
+msgid "State:"
+msgstr "СÑ?ан:"
+
+#: ../data/gnome-nettool.ui.h:63
+msgid "Successful packets:"
+msgstr "Ð?аÑ?пÑ?Ñ?овÑ?Ñ? пакеÑ?аÑ?:"
+
+#: ../data/gnome-nettool.ui.h:64 ../src/main.c:375
+msgid "Trace"
+msgstr "ТÑ?аÑ?Ñ?Ñ?аваÑ?Ñ?"
+
+#: ../data/gnome-nettool.ui.h:65
+msgid "Traceroute"
+msgstr "ТÑ?аÑ?Ñ?Ñ?аванне маÑ?Ñ?Ñ?Ñ?Ñ?Ñ?"
+
+#: ../data/gnome-nettool.ui.h:66
+msgid "Traceroute output"
+msgstr "Ð?Ñ?вад Ñ?Ñ?аÑ?Ñ?Ñ?аваннÑ? маÑ?Ñ?Ñ?Ñ?Ñ?Ñ?"
+
+#: ../data/gnome-nettool.ui.h:67
+msgid "Transmission errors:"
+msgstr "Ð?амÑ?лак пеÑ?адаÑ?Ñ?:"
+
+#: ../data/gnome-nettool.ui.h:68
+msgid "Transmitted bytes:"
+msgstr "Ð?еÑ?ададзена байÑ?аÑ?:"
+
+#: ../data/gnome-nettool.ui.h:69
+msgid "Transmitted packets:"
+msgstr "Ð?еÑ?ададзена пакеÑ?аÑ?:"
+
+#: ../data/gnome-nettool.ui.h:70
+msgid "Unlimited requests"
+msgstr "Ð?еабмежаванÑ?Ñ? колÑ?каÑ?Ñ?Ñ? запÑ?Ñ?аÑ?"
+
+#: ../data/gnome-nettool.ui.h:71
+msgid "User"
+msgstr "Ð?аÑ?Ñ?Ñ?Ñ?алÑ?нÑ?к"
+
+#: ../data/gnome-nettool.ui.h:72
+msgid "User name"
+msgstr "Ð?мÑ? каÑ?Ñ?Ñ?Ñ?алÑ?нÑ?ка"
+
+#: ../data/gnome-nettool.ui.h:73 ../src/main.c:918
+msgid "Whois"
+msgstr "Whois"
+
+#: ../data/gnome-nettool.ui.h:74
+msgid "Whois output"
+msgstr "Ð?Ñ?вад Whois"
+
+#: ../data/gnome-nettool.ui.h:75
+msgid "_Configure"
+msgstr "_Ð?аÑ?Ñ?Ñ?оÑ?Ñ?Ñ?"
+
+#: ../data/gnome-nettool.ui.h:76
+msgid "_Domain address:"
+msgstr "_Ð?аменнÑ? адÑ?аÑ?:"
+
+#: ../data/gnome-nettool.ui.h:77
+msgid "_Edit"
+msgstr "_Ð?Ñ?аÑ?ка"
+
+#: ../data/gnome-nettool.ui.h:78
+msgid "_Help"
+msgstr "_Ð?апамога"
+
+#: ../data/gnome-nettool.ui.h:79
+msgid "_Information type:"
+msgstr "_ТÑ?п звеÑ?Ñ?ак:"
+
+#: ../data/gnome-nettool.ui.h:80
+msgid "_Network address:"
+msgstr "_СеÑ?кавÑ? адÑ?аÑ?:"
+
+#: ../data/gnome-nettool.ui.h:81
+msgid "_Network device:"
+msgstr "С_еÑ?кавае пÑ?Ñ?Ñ?Ñ?аÑ?аванне:"
+
+#: ../data/gnome-nettool.ui.h:82
+msgid "_Tool"
+msgstr "Ð?Ñ?Ñ?_лада"
+
+#: ../data/gnome-nettool.ui.h:83
+msgid "_Username:"
+msgstr "Ð?_мÑ? каÑ?Ñ?Ñ?Ñ?алÑ?нÑ?ка:"
+
+#: ../data/gnome-nettool.ui.h:84
+msgid "ms"
+msgstr "мÑ?"
+
+#: ../data/gnome-nettool.ui.h:85
+msgid "requests"
+msgstr "запÑ?Ñ?аÑ?"
+
+#. Interface Name Interface Type icon Device prefix Pixbuf
+#: ../src/info.c:60
+msgid "Other type"
+msgstr "Ð?нÑ?Ñ? Ñ?Ñ?п"
+
+#: ../src/info.c:61
+msgid "Ethernet Interface"
+msgstr "Ð?нÑ?Ñ?Ñ?Ñ?ейÑ? Ethernet"
+
+#: ../src/info.c:62
+msgid "Wireless Interface"
+msgstr "Ð?еÑ?пÑ?аваднÑ? Ñ?нÑ?Ñ?Ñ?Ñ?ейÑ?"
+
+#: ../src/info.c:63
+msgid "Modem Interface"
+msgstr "Ð?адÑ?мнÑ? Ñ?нÑ?Ñ?Ñ?Ñ?ейÑ?"
+
+#: ../src/info.c:64
+msgid "Parallel Line Interface"
+msgstr "Ð?аÑ?алелÑ?нÑ? Ñ?нÑ?Ñ?Ñ?Ñ?ейÑ?"
+
+#: ../src/info.c:65
+msgid "Infrared Interface"
+msgstr "Ð?нÑ?Ñ?аÑ?Ñ?Ñ?вонÑ? Ñ?нÑ?Ñ?Ñ?Ñ?ейÑ?"
+
+#: ../src/info.c:66
+msgid "Loopback Interface"
+msgstr "Ð?нÑ?Ñ?Ñ?Ñ?ейÑ? loopback"
+
+#: ../src/info.c:67
+msgid "Unknown Interface"
+msgstr "Ð?евÑ?домÑ? Ñ?нÑ?Ñ?Ñ?Ñ?ейÑ?"
+
+#: ../src/info.c:165
+msgid "Network Devices Not Found"
+msgstr "СеÑ?кавÑ?Ñ? пÑ?Ñ?Ñ?Ñ?аÑ?аваннÑ? не знойдзенÑ?"
+
+#: ../src/info.c:400 ../src/info.c:403
+msgid "Unknown"
+msgstr "Ð?евÑ?дома"
+
+#: ../src/info.c:474
+msgid "Active"
+msgstr "Ð?кÑ?Ñ?Ñ?нÑ?"
+
+#: ../src/info.c:476
+msgid "Inactive"
+msgstr "Ð?еакÑ?Ñ?Ñ?нÑ?"
+
+#: ../src/info.c:481
+msgid "Loopback"
+msgstr "Loopback"
+
+#: ../src/info.c:490
+msgid "Enabled"
+msgstr "УклÑ?Ñ?анÑ?"
+
+#: ../src/info.c:492
+msgid "Disabled"
+msgstr "Ð?Ñ?клÑ?Ñ?анÑ?"
+
+#. The info output in a text format (to copy on clipboard)
+#: ../src/info.c:581
+#, c-format
+msgid "Network device:\t%s\n"
+msgstr "СеÑ?кавае пÑ?Ñ?Ñ?Ñ?аÑ?аванне:\t%s\n"
+
+#: ../src/info.c:582
+#, c-format
+msgid "Hardware address:\t%s\n"
+msgstr "Ð?паÑ?аÑ?нÑ? адÑ?аÑ?:\t%s\n"
+
+#: ../src/info.c:583
+#, c-format
+msgid "Multicast:\t%s\n"
+msgstr "Ð?Ñ?лÑ?Ñ?Ñ?каÑ?Ñ?-Ñ?Ñ?анÑ?лÑ?Ñ?Ñ?Ñ?:\t%s\n"
+
+#: ../src/info.c:584
+#, c-format
+msgid "MTU:\t%s\n"
+msgstr "MTU:\t%s\n"
+
+#: ../src/info.c:585
+#, c-format
+msgid "Link speed:\t%s\n"
+msgstr "Ð¥Ñ?Ñ?каÑ?Ñ?Ñ? злÑ?Ñ?Ñ?ннÑ?:\t%s\n"
+
+#: ../src/info.c:586
+#, c-format
+msgid "State:\t%s\n"
+msgstr "СÑ?ан:\t%s\n"
+
+#: ../src/info.c:588
+#, c-format
+msgid "Transmitted packets:\t%s\n"
+msgstr "Ð?еÑ?ададзена пакеÑ?аÑ?:\t%s\n"
+
+#: ../src/info.c:589
+#, c-format
+msgid "Transmission errors:\t%s\n"
+msgstr "Ð?амÑ?лак пеÑ?адаÑ?Ñ?:\t%s\n"
+
+#: ../src/info.c:590
+#, c-format
+msgid "Received packets:\t%s\n"
+msgstr "Ð?Ñ?Ñ?Ñ?мана пакеÑ?аÑ?:\t%s\n"
+
+#: ../src/info.c:591
+#, c-format
+msgid "Reception errors:\t%s\n"
+msgstr "Ð?амÑ?лак пÑ?Ñ?Ñ?мÑ?:\t%s\n"
+
+#: ../src/info.c:592
+#, c-format
+msgid "Collisions:\t%s\n"
+msgstr "Ð?алÑ?зÑ?й:\t%s\n"
+
+#: ../src/info.h:24
+msgid "not available"
+msgstr "недаÑ?Ñ?Ñ?пна"
+
+#: ../src/lookup.c:85
+#, c-format
+msgid "Looking up %s"
+msgstr "Ð?оÑ?Ñ?к %s"
+
+#: ../src/lookup.c:279
+msgid "Name"
+msgstr "Ð?азва"
+
+#. Time To Live of a hostname in a name server
+#: ../src/lookup.c:288
+msgid "TTL"
+msgstr "TTL"
+
+#: ../src/lookup.c:297
+msgid "Address Type"
+msgstr "ТÑ?п адÑ?аÑ?Ñ?"
+
+#: ../src/lookup.c:307
+msgid "Record Type"
+msgstr "ТÑ?п запÑ?Ñ?Ñ?"
+
+#: ../src/lookup.c:316
+msgid "Address"
+msgstr "Ð?дÑ?аÑ?"
+
+#. The lookup output in text format:
+#. Source of query (hostname/ip address),
+#. Time To Live (TTL), Address Type,
+#. Record Type (A, PTR, HINFO, NS, TXT, etc.),
+#. Resolution (results of the query)
+#. It's a tabular output, and these belongs to the column titles
+#: ../src/lookup.c:344
+msgid "Source\tTTL\tAddress Type\tRecord Type1\tResolution\n"
+msgstr "Ð?Ñ?Ñ?нÑ?Ñ?а\tTTL\tТÑ?п адÑ?аÑ?Ñ?\tТÑ?п запÑ?Ñ?Ñ?1\tÐ?Ñ?нÑ?к\n"
+
+#: ../src/main.c:82
+msgid "Load information for a network device"
+msgstr "Ð?агÑ?Ñ?зÑ?Ñ?Ñ? звеÑ?Ñ?кÑ? пÑ?а Ñ?еÑ?кавÑ? Ñ?нÑ?Ñ?Ñ?Ñ?ейÑ?"
+
+#: ../src/main.c:83
+msgid "DEVICE"
+msgstr "Ð?РЫСТÐ?СÐ?Ð?Ð?Ð?Ð?Ð?"
+
+#: ../src/main.c:86
+msgid "Send a ping to a network address"
+msgstr "Ð?Ñ?нгаваÑ?Ñ? Ñ?еÑ?кавÑ? адÑ?аÑ?"
+
+#: ../src/main.c:87 ../src/main.c:95 ../src/main.c:99 ../src/main.c:103
+msgid "HOST"
+msgstr "Ð?Ð?ШЫÐ?Ð?"
+
+#: ../src/main.c:90
+msgid "Get netstat information. Valid options are: route, active, multicast."
+msgstr "Ð?Ñ?Ñ?Ñ?маÑ?Ñ? звеÑ?Ñ?кÑ? netstat. Ð?агÑ?Ñ?мÑ?Ñ? опÑ?Ñ?Ñ?: route, active, multicast."
+
+#: ../src/main.c:91
+msgid "COMMAND"
+msgstr "Ð?Ð?Ð?Ð?Ð?"
+
+#: ../src/main.c:94
+msgid "Trace a route to a network address"
+msgstr "ТÑ?аÑ?Ñ?Ñ?аваÑ?Ñ? маÑ?Ñ?Ñ?Ñ?Ñ? да Ñ?еÑ?кавага адÑ?аÑ?Ñ?"
+
+#: ../src/main.c:98
+msgid "Port scan a network address"
+msgstr "СканаваÑ?Ñ? паÑ?Ñ?Ñ? Ñ?еÑ?кавага адÑ?аÑ?Ñ?"
+
+#: ../src/main.c:102
+msgid "Look up a network address"
+msgstr "Ð?оÑ?Ñ?к Ñ?еÑ?кавага адÑ?аÑ?Ñ?"
+
+#: ../src/main.c:106
+msgid "Finger command to run"
+msgstr "Ð?агад длÑ? запÑ?Ñ?кÑ? finger"
+
+#: ../src/main.c:107
+msgid "USER"
+msgstr "Ð?Ð?РЫСТÐ?Ð?ЬÐ?Ð?Ð?"
+
+#: ../src/main.c:110
+msgid "Perform a whois lookup for a network domain"
+msgstr "Ð?Ñ?канаÑ?Ñ? whois-поÑ?Ñ?к длÑ? Ñ?еÑ?кавага дамена"
+
+#: ../src/main.c:111
+msgid "DOMAIN"
+msgstr "Ð?Ð?Ð?Ð?Ð?"
+
+#: ../src/main.c:130
+#, c-format
+msgid ""
+"The file %s doesn't exist, please check if gnome-nettool is correctly "
+"installed"
+msgstr "Файл %s не Ñ?Ñ?нÑ?е. Ð?Ñ?авеÑ?Ñ?е пÑ?авÑ?лÑ?наÑ?Ñ?Ñ? Ñ?Ñ?Ñ?алÑ?Ñ?кÑ? gnome-nettool"
+
+#: ../src/main.c:482 ../src/netstat.c:455
+msgid "Protocol"
+msgstr "Ð?Ñ?аÑ?акол"
+
+#: ../src/main.c:489
+msgid "IP Address"
+msgstr "IP-адÑ?аÑ?"
+
+#: ../src/main.c:496
+msgid "Netmask / Prefix"
+msgstr "СеÑ?каваÑ? маÑ?ка / пÑ?Ñ?Ñ?Ñ?кÑ?"
+
+#: ../src/main.c:503
+msgid "Broadcast"
+msgstr "ТÑ?анÑ?лÑ?Ñ?Ñ?Ñ?"
+
+#: ../src/main.c:510
+msgid "Scope"
+msgstr "Ð?бÑ?аÑ?"
+
+#: ../src/main.c:667
+msgid "Default Information"
+msgstr "Ð?Ñ?адвÑ?знаÑ?анÑ?Ñ? звеÑ?Ñ?кÑ?"
+
+#: ../src/main.c:668
+msgid "Internet Address"
+msgstr "Ð?нÑ?Ñ?Ñ?нÑ?Ñ?-адÑ?аÑ? (A)"
+
+#: ../src/main.c:669
+msgid "Canonical Name"
+msgstr "Ð?ананÑ?Ñ?наÑ? назва (CNAME)"
+
+#: ../src/main.c:670
+msgid "CPU / OS Type"
+msgstr "ТÑ?п пÑ?аÑ?Ñ?Ñ?аÑ?а Ñ? апеÑ?аÑ?Ñ?йнай Ñ?Ñ?Ñ?Ñ?Ñ?мÑ? (HINFO)"
+
+#. When asking for MX record in DNS context
+#: ../src/main.c:672
+msgid "Mailbox Exchange"
+msgstr "Ð?апÑ?Ñ? паÑ?Ñ?овай Ñ?кÑ?Ñ?нÑ? (MX)"
+
+#: ../src/main.c:673
+msgid "Mailbox Information"
+msgstr "Ð?веÑ?Ñ?кÑ? аб паÑ?Ñ?овай Ñ?кÑ?Ñ?нÑ? (MINFO)"
+
+#. When asking for NS record in DNS context
+#: ../src/main.c:675
+msgid "Name Server"
+msgstr "СеÑ?веÑ? назваÑ? (NS)"
+
+#: ../src/main.c:676
+msgid "Host name for Address"
+msgstr "Ð?азва маÑ?Ñ?нÑ? длÑ? адÑ?аÑ?Ñ? (PTR)"
+
+#: ../src/main.c:677
+msgid "Start-of-authority"
+msgstr "Ð?Ñ?Ñ?нÑ?Ñ?а Ñ?паÑ?нажаваннÑ?Ñ? (SOA)"
+
+#: ../src/main.c:678
+msgid "Text Information"
+msgstr "Ð?веÑ?Ñ?кÑ? (TXT)"
+
+#: ../src/main.c:679
+msgid "Well Known Services"
+msgstr "Ð?обÑ?а вÑ?домÑ?Ñ? Ñ?лÑ?жбÑ? (WKS)"
+
+#: ../src/main.c:680
+msgid "Any / All Information"
+msgstr "УÑ?е звеÑ?Ñ?кÑ?"
+
+#: ../src/netstat.c:134
+msgid "Getting routing table"
+msgstr "Ð?Ñ?Ñ?Ñ?манне Ñ?аблÑ?Ñ?Ñ? маÑ?Ñ?Ñ?Ñ?Ñ?Ñ?заÑ?Ñ?Ñ?"
+
+#: ../src/netstat.c:149
+msgid "Getting active Internet connections"
+msgstr "Ð?Ñ?Ñ?Ñ?манне Ñ?пÑ?Ñ?а акÑ?Ñ?Ñ?нÑ?Ñ? Ð?нÑ?Ñ?Ñ?нÑ?Ñ?-злÑ?Ñ?Ñ?ннÑ?Ñ?"
+
+#: ../src/netstat.c:158
+msgid "Getting group memberships"
+msgstr "Ð?Ñ?Ñ?Ñ?манне звеÑ?Ñ?ак пÑ?а гÑ?Ñ?пÑ?"
+
+#: ../src/netstat.c:462
+msgid "IP Source"
+msgstr "IP-адÑ?аÑ? кÑ?Ñ?нÑ?Ñ?Ñ?"
+
+#: ../src/netstat.c:470
+msgid "Port/Service"
+msgstr "Ð?оÑ?Ñ?/Ñ?лÑ?жба"
+
+#: ../src/netstat.c:478 ../src/scan.c:318
+msgid "State"
+msgstr "СÑ?ан"
+
+#: ../src/netstat.c:632
+msgid "Destination/Prefix"
+msgstr "Ð?еÑ?Ñ?а пÑ?Ñ?знаÑ?Ñ?ннÑ?/пÑ?Ñ?Ñ?Ñ?кÑ?"
+
+#: ../src/netstat.c:634
+msgid "Destination"
+msgstr "Ð?еÑ?Ñ?а пÑ?Ñ?знаÑ?Ñ?ннÑ?"
+
+#: ../src/netstat.c:641
+msgid "Gateway"
+msgstr "СеÑ?каваÑ? бÑ?ама"
+
+#: ../src/netstat.c:649
+msgid "Netmask"
+msgstr "СеÑ?каваÑ? маÑ?ка"
+
+#: ../src/netstat.c:657 ../src/netstat.c:764
+msgid "Interface"
+msgstr "Ð?нÑ?Ñ?Ñ?Ñ?ейÑ?"
+
+#: ../src/netstat.c:771
+msgid "Member"
+msgstr "УдзелÑ?нÑ?к"
+
+#: ../src/netstat.c:779
+msgid "Group"
+msgstr "Ð?Ñ?Ñ?па"
+
+#. The netstat "Display active network services" output in
+#. text format.
+#. It's a tabular output, and these belongs to the column titles
+#: ../src/netstat.c:821
+msgid "Protocol\tIP Source\tPort/Service\tState\n"
+msgstr "Ð?Ñ?аÑ?акол\tIP-адÑ?аÑ? кÑ?Ñ?нÑ?Ñ?Ñ?\tÐ?оÑ?Ñ?/Ñ?лÑ?жба\tСÑ?ан\n"
+
+#. The netstat "Display routing" output in text format.
+#. This seems as a route table.
+#. It's a tabular output, and these belongs to the column titles
+#: ../src/netstat.c:827
+msgid "Destination\tGateway\tNetmask\tInterface\n"
+msgstr "Ð?еÑ?Ñ?а пÑ?Ñ?знаÑ?Ñ?ннÑ?\tСеÑ?каваÑ? бÑ?ама\tСеÑ?каваÑ? маÑ?ка\tÐ?нÑ?Ñ?Ñ?Ñ?ейÑ?\n"
+
+#. The netstat "Multicast information" output in text format.
+#. It's a tabular output, and these belongs to the column titles
+#: ../src/netstat.c:832
+msgid "Interface\tMember\tGroup\n"
+msgstr "Ð?нÑ?Ñ?Ñ?Ñ?ейÑ?\tУдзелÑ?нÑ?к\tÐ?Ñ?Ñ?па\n"
+
+#: ../src/nettool.c:204
+msgid "A network address was not specified"
+msgstr "СеÑ?кавÑ? адÑ?аÑ? не бÑ?Ñ? вÑ?знаÑ?анÑ?"
+
+#: ../src/nettool.c:205 ../src/nettool.c:214
+msgid "Please enter a valid network address and try again."
+msgstr "УвÑ?дзÑ?Ñ?е каÑ?Ñ?кÑ?нÑ? Ñ?еÑ?кавÑ? адÑ?аÑ? Ñ? паÑ?Ñ?аÑ?Ñ?Ñ?е Ñ?пÑ?обÑ?."
+
+#: ../src/nettool.c:212
+#, c-format
+msgid "The address '%s' cannot be found"
+msgstr "Ð?дÑ?аÑ? \"%s\" не знойдзенÑ?"
+
+#: ../src/nettool.c:241
+msgid "A domain address was not specified"
+msgstr "Ð?аменнÑ? адÑ?аÑ? не бÑ?Ñ? вÑ?знаÑ?анÑ?"
+
+#: ../src/nettool.c:242
+msgid "Please enter a valid domain address and try again."
+msgstr "УвÑ?дзÑ?Ñ?е каÑ?Ñ?кÑ?нÑ? даменнÑ? адÑ?аÑ? Ñ? паÑ?Ñ?аÑ?Ñ?Ñ?е Ñ?пÑ?обÑ?."
+
+#: ../src/nettool.c:433
+msgid "Information not available"
+msgstr "Ð?веÑ?Ñ?кÑ? адÑ?Ñ?Ñ?нÑ?Ñ?аÑ?Ñ?Ñ?"
+
+#: ../src/nettool.c:553
+msgid "Stop"
+msgstr "СпÑ?нÑ?Ñ?Ñ?"
+
+#: ../src/nettool.c:559
+msgid "Run"
+msgstr "Ð?апÑ?Ñ?Ñ?Ñ?Ñ?Ñ?"
+
+#. Created up here so we can get the geometry info.
+#: ../src/ping.c:155
+msgid "Time (ms):"
+msgstr "ЧаÑ? (мÑ?):"
+
+#: ../src/ping.c:176
+msgid "Seq. No.:"
+msgstr "Ð?Ñ?маÑ?:"
+
+#: ../src/ping.c:261
+#, c-format
+msgid "Sending ping requests to %s"
+msgstr "Ð?Ñ?нгаванне %s"
+
+#: ../src/ping.c:577
+msgid "Bytes"
+msgstr "Ð?айÑ?аÑ?"
+
+#: ../src/ping.c:584
+msgid "Source"
+msgstr "Ð?Ñ?Ñ?нÑ?Ñ?а"
+
+#: ../src/ping.c:592
+msgid "Seq"
+msgstr "Ð?Ñ?маÑ?"
+
+#: ../src/ping.c:602
+msgid "Time"
+msgstr "ЧаÑ?"
+
+#: ../src/ping.c:610
+msgid "Units"
+msgstr "Ð?дзÑ?нкÑ?"
+
+#. The ping output in text format:
+#. Bytes received, Address Source, Number of Sequence,
+#. Round Trip Time (Time), Units of Time.
+#. It's a tabular output, and these belongs to the column titles
+#: ../src/ping.c:636
+msgid "Bytes\tSource\tSeq\tTime\tUnits\n"
+msgstr "Ð?айÑ?аÑ?\tÐ?Ñ?Ñ?нÑ?Ñ?а\tÐ?Ñ?маÑ?\tЧаÑ?\tÐ?дзÑ?нкÑ?\n"
+
+#. The ping output in a text format (to copy on clipboard)
+#: ../src/ping.c:651
+#, c-format
+msgid "Time minimum:\t%s ms\n"
+msgstr "Ð?Ñ?нÑ?малÑ?нÑ? Ñ?аÑ?:\t%s мÑ?\n"
+
+#: ../src/ping.c:652
+#, c-format
+msgid "Time average:\t%s ms\n"
+msgstr "СÑ?Ñ?Ñ?днÑ? Ñ?аÑ?:\t%s мÑ?\n"
+
+#: ../src/ping.c:653
+#, c-format
+msgid "Time maximum:\t%s ms\n"
+msgstr "Ð?акÑ?Ñ?малÑ?нÑ? Ñ?аÑ?:\t%s мÑ?\n"
+
+#: ../src/ping.c:655
+#, c-format
+msgid "Packets transmitted:\t%s\n"
+msgstr "Ð?еÑ?ададзена пакеÑ?аÑ?:\t%s\n"
+
+#: ../src/ping.c:657
+#, c-format
+msgid "Packets received:\t%s\n"
+msgstr "Ð?Ñ?Ñ?Ñ?мана пакеÑ?аÑ?:\t%s\n"
+
+#: ../src/ping.c:660
+#, c-format
+msgid "Successful packets:\t%s\n"
+msgstr "Ð?аÑ?пÑ?Ñ?овÑ?Ñ? пакеÑ?аÑ?:\t%s\n"
+
+#: ../src/scan.c:98
+#, c-format
+msgid "Scanning %s for open ports"
+msgstr "Сканаванне адкÑ?Ñ?Ñ?Ñ?Ñ? паÑ?Ñ?оÑ? %s"
+
+#: ../src/scan.c:173
+msgid "unknown"
+msgstr "невÑ?дома"
+
+#. Translators: "open" is a network status and should be one word.
+#: ../src/scan.c:177
+msgid "open"
+msgstr "адкÑ?Ñ?Ñ?Ñ?"
+
+#: ../src/scan.c:310
+msgid "Port"
+msgstr "Ð?оÑ?Ñ?"
+
+#: ../src/scan.c:326
+msgid "Service"
+msgstr "СлÑ?жба"
+
+#. The portscan output in text format:
+#. Port, State, Service.
+#. It's a tabular output, and these belongs to the column titles
+#: ../src/scan.c:348
+msgid "Port\tState\tService\n"
+msgstr "Ð?оÑ?Ñ?\tСÑ?ан\tСлÑ?жба\n"
+
+#: ../src/traceroute.c:66
+#, c-format
+msgid "Tracing route to %s"
+msgstr "ТÑ?аÑ?Ñ?Ñ?аванне маÑ?Ñ?Ñ?Ñ?Ñ?Ñ? да %s"
+
+#: ../src/traceroute.c:269
+msgid "Hop"
+msgstr "Ð?Ñ?ок"
+
+#: ../src/traceroute.c:277
+msgid "Hostname"
+msgstr "Ð?азва маÑ?Ñ?нÑ?"
+
+#: ../src/traceroute.c:285
+msgid "IP"
+msgstr "IP"
+
+#: ../src/traceroute.c:296
+msgid "Time 1"
+msgstr "ЧаÑ? 1"
+
+#: ../src/traceroute.c:306
+msgid "Time 2"
+msgstr "ЧаÑ? 2"
+
+#. The traceroute output in text format:
+#. Hop count, Hostname, IP, Round Trip Time 1 (Time1),
+#. Round Trip Time 2 (Time2),
+#. It's a tabular output, and these belongs to the column titles
+#: ../src/traceroute.c:332
+msgid "Hop\tHostname\tIP\tTime 1\tTime 2\n"
+msgstr "Ð?Ñ?ок\tÐ?азва маÑ?Ñ?нÑ?\tIP\tЧаÑ? 1\tЧаÑ? 2\n"
+
+#: ../src/utils.c:231
+#, c-format
+msgid ""
+"In order to use this feature of the program, %s must be installed in your "
+"system"
+msgstr "Ð?аб змагÑ?Ñ? каÑ?Ñ?Ñ?Ñ?аÑ?Ñ?а гÑ?Ñ?ай Ñ?Ñ?нкÑ?Ñ?Ñ?й пÑ?агÑ?амÑ?, Ñ?Ñ?Ñ?ба Ñ?Ñ?Ñ?алÑ?ваÑ?Ñ? %s"
+
+#: ../src/finger.c:66
+#, c-format
+msgid "Getting information of %s on \"%s\""
+msgstr "Ð?Ñ?Ñ?Ñ?манне звеÑ?Ñ?ак пÑ?а %s на \"%s\""
+
+#: ../src/finger.c:70
+#, c-format
+msgid "Getting information of all users on \"%s\""
+msgstr "Ð?Ñ?Ñ?Ñ?манне звеÑ?Ñ?ак пÑ?а Ñ?Ñ?Ñ?Ñ? каÑ?Ñ?Ñ?Ñ?алÑ?нÑ?каÑ? на \"%s\""
+
+#: ../src/whois.c:62
+#, c-format
+msgid "Getting the whois information of %s"
+msgstr "Ð?Ñ?Ñ?Ñ?манне whois-звеÑ?Ñ?ак длÑ? %s"
diff -pruN 3.0.0-2/po/ca valencia po 3.0.1-0ubuntu1/po/ca valencia po
--- 3.0.0-2/po/ca valencia po 2010-12-02 09:26:14.000000000 +0000
+++ 3.0.1-0ubuntu1/po/ca valencia po 2011-12-31 23:54:24.000000000 +0000
@@ -5,54 +5,57 @@
# Softcatala <linux softcatala org>, 2000.
# Xavier Conde Rueda <xavi conde gmail com>, 2004.
# Jordi Mallach <jordi sindominio net>, 2004, 2005, 2006, 2007.
+# Joan Duran <jodufi gmail com>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: gnome-nettool\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-29 01:11+0100\n"
-"PO-Revision-Date: 2009-09-15 00:01+0200\n"
-"Last-Translator: Xavier Conde Rueda <xavi conde gmail com>\n"
+"POT-Creation-Date: 2011-05-29 18:27+0200\n"
+"PO-Revision-Date: 2011-04-04 00:15+0200\n"
+"Last-Translator: Joan Duran <jodufi gmail com>\n"
"Language-Team: Catalan <tradgnome softcatala org>\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"
-#: ../src/callbacks.c:323
+#: ../src/callbacks.c:332
msgid "translator-credits"
msgstr ""
"Ivan Vilata i Balaguer <al011097 alumail uji es>\n"
-"Xavier Conde Rueda <xavi conde gmail com>"
+"Xavier Conde Rueda <xavi conde gmail com>\n"
+"Joan Duran <jodufi gmail com>"
#. Translators: %s is the name of the copyright holder
-#: ../src/callbacks.c:330
+#: ../src/callbacks.c:339
#, c-format
msgid "Copyright © 2003-2008 %s"
msgstr "Copyright © 2003-2008 %s"
#. Dear translator: This is the name of the application
-#: ../src/callbacks.c:334 ../src/callbacks.c:335
+#: ../src/callbacks.c:343 ../src/callbacks.c:344
#: ../data/gnome-nettool.desktop.in.in.h:1
msgid "Network Tools"
msgstr "Eines de xarxa"
-#: ../src/callbacks.c:337
+#: ../src/callbacks.c:346
msgid "Graphical user interface for common network utilities"
msgstr "InterfÃcie grà fica d'usuari per a utilitats de xarxa habituals"
-#: ../src/callbacks.c:449 ../src/main.c:142 ../src/nettool.c:483
+#: ../src/callbacks.c:458 ../src/main.c:142 ../src/nettool.c:483
msgid "Idle"
msgstr "Inactiu"
#. Dear Translator: This is the Window Title. 'Network Tools' is the
#. * name of the application
-#: ../src/callbacks.c:454
+#: ../src/callbacks.c:463
#, c-format
msgid "%s - Network Tools"
msgstr "%s - Eines de xarxa"
-#: ../src/callbacks.c:478
+#: ../src/callbacks.c:487
msgid "Unable to open help file"
msgstr "No s'ha pogut obrir el fitxer d'ajuda"
@@ -60,6 +63,30 @@ msgstr "No s'ha pogut obrir el fitxer d'
msgid "View information about your network"
msgstr "Visualitzeu informació sobre la xarxa"
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:1
+msgid "A list of domains previously used"
+msgstr "Una llista de dominis utilitzats anteriorment"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:2
+msgid "A list of hostnames previously used"
+msgstr "Una llista de noms d'ordinador utilitzats anteriorment"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:3
+msgid "A list of usernames previously used"
+msgstr "Una llista de noms d'usuari utilitzats anteriorment"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:4
+msgid "Historically used domains"
+msgstr "Historial dels dominis utilitzats"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:5
+msgid "Historically used hostnames"
+msgstr "Historial dels noms d'ordinador utilitzats"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:6
+msgid "Historically used usernames"
+msgstr "Historial dels noms d'usuari utilitzats"
+
#: ../data/gnome-nettool.ui.h:1
msgid "0"
msgstr "0"
@@ -188,7 +215,7 @@ msgstr ""
msgid "Enter the user to finger"
msgstr "Introduïu l'usuari al qual fer un finger"
-#: ../data/gnome-nettool.ui.h:28 ../src/main.c:814
+#: ../data/gnome-nettool.ui.h:28 ../src/main.c:812
msgid "Finger"
msgstr "Finger"
@@ -208,7 +235,7 @@ msgstr "Ordinador"
msgid "Link speed:"
msgstr "Velocitat de l'enllaç:"
-#: ../data/gnome-nettool.ui.h:33 ../src/main.c:734
+#: ../data/gnome-nettool.ui.h:33 ../src/main.c:732
msgid "Lookup"
msgstr "Cerca"
@@ -318,7 +345,7 @@ msgstr "Errors de recepció:"
msgid "Routing Table Information"
msgstr "Informació de la taula d'encaminament"
-#: ../data/gnome-nettool.ui.h:60 ../src/main.c:619
+#: ../data/gnome-nettool.ui.h:60 ../src/main.c:617
msgid "Scan"
msgstr "Escaneja"
@@ -371,7 +398,7 @@ msgid "User name"
msgstr "Nom d'usuari"
# FIXME: jo deixaria "Whois" (josep)
-#: ../data/gnome-nettool.ui.h:73 ../src/main.c:920
+#: ../data/gnome-nettool.ui.h:73 ../src/main.c:918
msgid "Whois"
msgstr "Whois"
@@ -446,7 +473,7 @@ msgstr "InterfÃcie de lÃnia paral·lel
#: ../src/info.c:65
msgid "Infrared Interface"
-msgstr "InterfÃcie d'infrarojos"
+msgstr "InterfÃcie d'infraroigs"
#: ../src/info.c:66
msgid "Loopback Interface"
@@ -460,82 +487,82 @@ msgstr "InterfÃcie desconeguda"
msgid "Network Devices Not Found"
msgstr "No s'ha trobat cap dispositiu de xarxa"
-#: ../src/info.c:392 ../src/info.c:395
+#: ../src/info.c:400 ../src/info.c:403
msgid "Unknown"
msgstr "Desconegut"
-#: ../src/info.c:466
+#: ../src/info.c:474
msgid "Active"
msgstr "Activa"
-#: ../src/info.c:468
+#: ../src/info.c:476
msgid "Inactive"
msgstr "Inactiva"
-#: ../src/info.c:473
+#: ../src/info.c:481
msgid "Loopback"
msgstr "Loopback"
-#: ../src/info.c:482
+#: ../src/info.c:490
msgid "Enabled"
msgstr "Habilitada"
-#: ../src/info.c:484
+#: ../src/info.c:492
msgid "Disabled"
msgstr "Inhabilitada"
#. The info output in a text format (to copy on clipboard)
-#: ../src/info.c:573
+#: ../src/info.c:581
#, c-format
msgid "Network device:\t%s\n"
msgstr "Dispositiu de xarxa:\t%s\n"
-#: ../src/info.c:574
+#: ../src/info.c:582
#, c-format
msgid "Hardware address:\t%s\n"
msgstr "Adreça del maquinari:\t%s\n"
-#: ../src/info.c:575
+#: ../src/info.c:583
#, c-format
msgid "Multicast:\t%s\n"
msgstr "Multidifusió:\t%s\n"
-#: ../src/info.c:576
+#: ../src/info.c:584
#, c-format
msgid "MTU:\t%s\n"
msgstr "UTM:\t%s\n"
-#: ../src/info.c:577
+#: ../src/info.c:585
#, c-format
msgid "Link speed:\t%s\n"
msgstr "Velocitat de l'enllaç:\t%s\n"
-#: ../src/info.c:578
+#: ../src/info.c:586
#, c-format
msgid "State:\t%s\n"
msgstr "Estat:\t%s\n"
-#: ../src/info.c:580
+#: ../src/info.c:588
#, c-format
msgid "Transmitted packets:\t%s\n"
msgstr "Paquets transmesos:\t%s\n"
-#: ../src/info.c:581
+#: ../src/info.c:589
#, c-format
msgid "Transmission errors:\t%s\n"
msgstr "Errors de transmissió:\t%s\n"
-#: ../src/info.c:582
+#: ../src/info.c:590
#, c-format
msgid "Received packets:\t%s\n"
msgstr "Paquets rebuts:\t%s\n"
-#: ../src/info.c:583
+#: ../src/info.c:591
#, c-format
msgid "Reception errors:\t%s\n"
msgstr "Errors de recepció:\t%s\n"
-#: ../src/info.c:584
+#: ../src/info.c:592
#, c-format
msgid "Collisions:\t%s\n"
msgstr "Col·lisions:\t%s\n"
@@ -663,54 +690,54 @@ msgstr "Difusió"
msgid "Scope"
msgstr "Abast"
-#: ../src/main.c:669
+#: ../src/main.c:667
msgid "Default Information"
msgstr "Informació predeterminada"
-#: ../src/main.c:670
+#: ../src/main.c:668
msgid "Internet Address"
msgstr "Adreça d'Internet"
-#: ../src/main.c:671
+#: ../src/main.c:669
msgid "Canonical Name"
msgstr "Nom canònic"
-#: ../src/main.c:672
+#: ../src/main.c:670
msgid "CPU / OS Type"
-msgstr "UCP / Tipus de SO"
+msgstr "CPU / Tipus de SO"
#. When asking for MX record in DNS context
-#: ../src/main.c:674
+#: ../src/main.c:672
msgid "Mailbox Exchange"
msgstr "Bústia Exchange"
-#: ../src/main.c:675
+#: ../src/main.c:673
msgid "Mailbox Information"
msgstr "Informació de la bústia"
#. When asking for NS record in DNS context
-#: ../src/main.c:677
+#: ../src/main.c:675
msgid "Name Server"
msgstr "Nom del servidor"
-#: ../src/main.c:678
+#: ../src/main.c:676
msgid "Host name for Address"
msgstr "Nom de l'ordinador de l'adreça"
-#: ../src/main.c:679
+#: ../src/main.c:677
msgid "Start-of-authority"
msgstr "Inici-d'autoritat"
-#: ../src/main.c:680
+#: ../src/main.c:678
msgid "Text Information"
msgstr "Informació de text"
# FIXME
-#: ../src/main.c:681
+#: ../src/main.c:679
msgid "Well Known Services"
msgstr "Servei ben conegut"
-#: ../src/main.c:682
+#: ../src/main.c:680
msgid "Any / All Information"
msgstr "Cap / tota informació"
@@ -813,7 +840,7 @@ msgstr "Informació no disponible"
#: ../src/nettool.c:548
msgid "Stop"
-msgstr "Atura"
+msgstr "Para"
#: ../src/nettool.c:554
msgid "Run"
@@ -824,32 +851,32 @@ msgstr "Executa"
msgid "Time (ms):"
msgstr "Temps (ms):"
-#: ../src/ping.c:171
+#: ../src/ping.c:172
msgid "Seq. No.:"
-msgstr "Num. seq.:"
+msgstr "Núm. seq.:"
-#: ../src/ping.c:254
+#: ../src/ping.c:257
#, c-format
msgid "Sending ping requests to %s"
msgstr "S'estan enviant peticions de ping a %s"
-#: ../src/ping.c:569
+#: ../src/ping.c:572
msgid "Bytes"
msgstr "Bytes"
-#: ../src/ping.c:576
+#: ../src/ping.c:579
msgid "Source"
msgstr "Origen"
-#: ../src/ping.c:584
+#: ../src/ping.c:587
msgid "Seq"
msgstr "Seqüència"
-#: ../src/ping.c:594
+#: ../src/ping.c:597
msgid "Time"
msgstr "Temps"
-#: ../src/ping.c:602
+#: ../src/ping.c:605
msgid "Units"
msgstr "Unitat"
@@ -857,37 +884,37 @@ msgstr "Unitat"
#. Bytes received, Address Source, Number of Sequence,
#. Round Trip Time (Time), Units of Time.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/ping.c:628
+#: ../src/ping.c:631
msgid "Bytes\tSource\tSeq\tTime\tUnits\n"
msgstr "Bytes\tOrigen\tSeqüència\tTemps\tUnitats\n"
#. The ping output in a text format (to copy on clipboard)
-#: ../src/ping.c:643
+#: ../src/ping.c:646
#, c-format
msgid "Time minimum:\t%s ms\n"
msgstr "Temps mÃnim:\t%s ms\n"
-#: ../src/ping.c:644
+#: ../src/ping.c:647
#, c-format
msgid "Time average:\t%s ms\n"
msgstr "Temps mitjà :\t%s ms\n"
-#: ../src/ping.c:645
+#: ../src/ping.c:648
#, c-format
msgid "Time maximum:\t%s ms\n"
msgstr "Temps mà xim:\t%s ms\n"
-#: ../src/ping.c:647
+#: ../src/ping.c:650
#, c-format
msgid "Packets transmitted:\t%s\n"
msgstr "Paquets transmesos:\t%s\n"
-#: ../src/ping.c:649
+#: ../src/ping.c:652
#, c-format
msgid "Packets received:\t%s\n"
msgstr "Paquets rebuts:\t%s\n"
-#: ../src/ping.c:652
+#: ../src/ping.c:655
#, c-format
msgid "Successful packets:\t%s\n"
msgstr "Paquets correctes:\t%s\n"
@@ -960,7 +987,7 @@ msgid ""
"In order to use this feature of the program, %s must be installed in your "
"system"
msgstr ""
-"Per a poder fer servir esta caracterÃstica del programa, heu de tindre "
+"Per poder fer servir esta caracterÃstica del programa, heu de tindre "
"instal·lat %s al sistema."
#: ../src/finger.c:63
diff -pruN 3.0.0-2/po/el.po 3.0.1-0ubuntu1/po/el.po
--- 3.0.0-2/po/el.po 2010-12-02 09:26:14.000000000 +0000
+++ 3.0.1-0ubuntu1/po/el.po 2011-12-31 23:54:24.000000000 +0000
@@ -9,19 +9,22 @@
# Kostas Papadimas <pkst gnome org>, 2003, 2004, 2006.
# Nikos Charonitakis <charosn her forthnet gr>, 2004.
# Jennie Petoumenou <epetoumenou gmail com>, 2009.
+# Ioannis Zampoukas <ioza1964 yahoo gr>, 2011.
+#
msgid ""
msgstr ""
"Project-Id-Version: el\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-14 18:36+0300\n"
-"PO-Revision-Date: 2009-10-14 18:38+0200\n"
-"Last-Translator: Kostas Papadimas <pkst gnome org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
+"nettool&component=general\n"
+"POT-Creation-Date: 2010-11-10 22:40+0000\n"
+"PO-Revision-Date: 2011-10-14 21:34+0300\n"
+"Last-Translator: Ioannis Zampoukas <ioza1964 yahoo gr>\n"
"Language-Team: Greek <team gnome gr>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Lokalize 0.2\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: ../src/callbacks.c:323
msgid "translator-credits"
@@ -34,9 +37,8 @@ msgid "Copyright © 2003-2008 %s"
msgstr "Copyright © 2003-2008 %s"
#. Dear translator: This is the name of the application
-#: ../src/callbacks.c:334
-#: ../src/callbacks.c:335
-#: ../src/gnome-nettool.desktop.in.in.h:1
+#: ../src/callbacks.c:334 ../src/callbacks.c:335
+#: ../data/gnome-nettool.desktop.in.in.h:1
msgid "Network Tools"
msgstr "Î?Ï?γαλεία δικÏ?Ï?οÏ?"
@@ -44,364 +46,406 @@ msgstr "Î?Ï?γαλεία δικÏ?Ï?οÏ?"
msgid "Graphical user interface for common network utilities"
msgstr "Î?Ï?αÏ?ική διεÏ?αÏ?ή Ï?Ï?ήÏ?Ï?η για κοινÎÏ? εÏ?αÏ?μογÎÏ? δικÏ?Ï?οÏ?"
-#: ../src/callbacks.c:450
-#: ../src/main.c:142
-#: ../src/nettool.c:483
+#: ../src/callbacks.c:449 ../src/main.c:142 ../src/nettool.c:483
msgid "Idle"
msgstr "Î?δÏ?ανήÏ?"
#. Dear Translator: This is the Window Title. 'Network Tools' is the
#. * name of the application
-#: ../src/callbacks.c:455
+#: ../src/callbacks.c:454
#, c-format
msgid "%s - Network Tools"
msgstr "%s - Î?Ï?γαλεία δικÏ?Ï?οÏ?"
-#: ../src/callbacks.c:479
+#: ../src/callbacks.c:478
msgid "Unable to open help file"
msgstr "Î?δÏ?ναÏ?ο Ï?ο άνοιγμα Ï?οÏ? αÏ?Ï?είοÏ? βοήθειαÏ?."
-#: ../src/gnome-nettool.ui.h:1
+#: ../data/gnome-nettool.desktop.in.in.h:2
+msgid "View information about your network"
+msgstr "Î Ï?οβολή Ï?ληÏ?οÏ?οÏ?ιÏ?ν για Ï?ο δίκÏ?Ï?ο Ï?αÏ?"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:1
+msgid "A list of domains previously used"
+msgstr "Î?ια λίÏ?Ï?α με Ï?ομείÏ? Ï?οÏ? Ï?Ï?ηÏ?ιμοÏ?οιοÏ?νÏ?αν"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:2
+msgid "A list of hostnames previously used"
+msgstr "Î?ια λίÏ?Ï?α αÏ?Ï? ονÏ?μαÏ?α Ï?Ï?ολογιÏ?Ï?Ï?ν Ï?οÏ? Ï?Ï?ηÏ?ιμοÏ?οιοÏ?νÏ?αν"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:3
+msgid "A list of usernames previously used"
+msgstr "Î?ία λίÏ?Ï?α Ï?Ï?ν ονομάÏ?Ï?ν Ï?Ï?ήÏ?Ï?η Ï?οÏ? Ï?Ï?ηÏ?ιμοÏ?οιοÏ?νÏ?αν"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:4
+msgid "Historically used domains"
+msgstr "Î?Ï?Ï?οÏ?ικά Ï?Ï?ηÏ?ιμοÏ?οιηθÎνÏ?εÏ? Ï?ομείÏ?"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:5
+msgid "Historically used hostnames"
+msgstr "Î?Ï?Ï?οÏ?ικαÌ? Ï?Ï?ηÏ?ιμοÏ?οιηθεÌ?νÏ?εÏ? Ï?ομειÌ?Ï?"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:6
+msgid "Historically used usernames"
+msgstr "Î?Ï?Ï?οÏ?ικαÌ? Ï?Ï?ηÏ?ιμοÏ?οιηθεÌ?νÏ?α ονÏ?μαÏ?α Ï?Ï?ηÏ?Ï?Ï?ν"
+
+#: ../data/gnome-nettool.ui.h:1
msgid "0"
msgstr "0"
-#: ../src/gnome-nettool.ui.h:3
+#: ../data/gnome-nettool.ui.h:3
#, no-c-format
msgid "0%"
msgstr "0%"
-#: ../src/gnome-nettool.ui.h:4
+#: ../data/gnome-nettool.ui.h:4
msgid "0.0"
msgstr "0.0"
-#: ../src/gnome-nettool.ui.h:5
+#: ../data/gnome-nettool.ui.h:5
msgid "<b>IP Information</b>"
msgstr "<b>ΠληÏ?οÏ?οÏ?ία IP</b>"
-#: ../src/gnome-nettool.ui.h:6
+#: ../data/gnome-nettool.ui.h:6
msgid "<b>Interface Information</b>"
msgstr "<b>ΠληÏ?οÏ?οÏ?ία Î?ιεÏ?αÏ?ήÏ?</b>"
-#: ../src/gnome-nettool.ui.h:7
+#: ../data/gnome-nettool.ui.h:7
msgid "<b>Interface Statistics</b>"
msgstr "<b>ΣÏ?αÏ?ιÏ?Ï?ικά Î?ιεÏ?αÏ?ήÏ?</b>"
-#: ../src/gnome-nettool.ui.h:8
+#: ../data/gnome-nettool.ui.h:8
msgid "<b>Round Trip Time Statistics</b>"
msgstr "<b>ΣÏ?αÏ?ιÏ?Ï?ικά Round Trip Time</b>"
-#: ../src/gnome-nettool.ui.h:9
+#: ../data/gnome-nettool.ui.h:9
msgid "<b>Transmission Statistics</b>"
msgstr "<b>ΣÏ?αÏ?ιÏ?Ï?ικά Î?εÏ?άδοÏ?ηÏ?</b>"
-#: ../src/gnome-nettool.ui.h:10
+#: ../data/gnome-nettool.ui.h:10
msgid "Active Network Services"
msgstr "Î?νεÏ?γÎÏ? Î¥Ï?ηÏ?εÏ?ίεÏ? Î?ικÏ?Ï?οÏ?"
-#: ../src/gnome-nettool.ui.h:11
+#: ../data/gnome-nettool.ui.h:11
msgid "Average:"
msgstr "Î?ÎÏ?οÏ? Ï?Ï?οÏ?:"
-#: ../src/gnome-nettool.ui.h:12
+#: ../data/gnome-nettool.ui.h:12
msgid "Beep on ping"
msgstr "Î?οÏ?δοÏ?νιÏ?μα Ï?Ï?ο ping"
-#: ../src/gnome-nettool.ui.h:13
+#: ../data/gnome-nettool.ui.h:13
msgid "Clear _History"
msgstr "Î?κκαθάÏ?ιÏ?η Î?_Ï?Ï?οÏ?ικοÏ?"
-#: ../src/gnome-nettool.ui.h:14
+#: ../data/gnome-nettool.ui.h:14
msgid "Collisions:"
msgstr "ΣÏ?γκÏ?οÏ?Ï?ειÏ?:"
-#: ../src/gnome-nettool.ui.h:15
+#: ../data/gnome-nettool.ui.h:15
msgid "Copy as text _report"
msgstr "Î?νÏ?ιγÏ?αÏ?ή Ï?Ï? αναÏ?ο_Ï?ά κειμÎνοÏ?"
-#: ../src/gnome-nettool.ui.h:16
+#: ../data/gnome-nettool.ui.h:16
msgid "Details"
msgstr "Î?εÏ?Ï?ομÎÏ?ειεÏ?"
-#: ../src/gnome-nettool.ui.h:17
+#: ../data/gnome-nettool.ui.h:17
msgid "Devices"
msgstr "ΣÏ?Ï?κεÏ?ÎÏ?"
-#: ../src/gnome-nettool.ui.h:18
+#: ../data/gnome-nettool.ui.h:18
msgid "Devices - Network Tools"
msgstr "ΣÏ?Ï?κεÏ?ÎÏ? - Î?Ï?γαλεία δικÏ?Ï?οÏ?"
-#: ../src/gnome-nettool.ui.h:19
+#: ../data/gnome-nettool.ui.h:19
msgid "Display:"
msgstr "Î?μÏ?άνιÏ?η:"
-#: ../src/gnome-nettool.ui.h:20
+#: ../data/gnome-nettool.ui.h:20
msgid "Domain address"
msgstr "Î?ιεÏ?θÏ?νÏ?η Ï?ομÎα"
-#: ../src/gnome-nettool.ui.h:21
-msgid "Enter a domain address to lookup its whois information. For example: www.domain.com or 192.168.2.1"
-msgstr "Î?ιÏ?άγεÏ?ε μια διεÏ?θÏ?νÏ?η δικÏ?Ï?οÏ? για αναζήÏ?ηÏ?η Ï?ληÏ?οÏ?οÏ?ιÏ?ν whois. Î?ια Ï?αÏ?άδειγμα: www.domain.com ή 192.168.2.1"
-
-#: ../src/gnome-nettool.ui.h:22
-msgid "Enter the network address to finger that user. For example: www.domain.com or 192.168.2.1"
-msgstr "Î?ιÏ?άγεÏ?ε Ï?η διεÏ?θÏ?νÏ?η δικÏ?Ï?οÏ? για να κάνεÏ?ε finger αÏ?Ï?Ï? Ï?ο Ï?Ï?ήÏ?Ï?η. Î?ια Ï?αÏ?άδειγμα: auth.domain.com ή 192.168.2.1"
-
-#: ../src/gnome-nettool.ui.h:23
-msgid "Enter the network address to lookup. For example: www.domain.com or 192.168.2.1"
-msgstr "Î?ιÏ?άγεÏ?ε Ï?η διεÏ?θÏ?νÏ?η δικÏ?Ï?οÏ? για lookup. Î?ια Ï?αÏ?άδειγμα: www.domain.com ή 192.168.2.1"
-
-#: ../src/gnome-nettool.ui.h:24
-msgid "Enter the network address to ping. For example: www.domain.com or 192.168.2.1"
-msgstr "Î?ιÏ?άγεÏ?ε Ï?η διεÏ?θÏ?νÏ?η δικÏ?Ï?οÏ? για ping. Î?ια Ï?αÏ?άδειγμα: www.domain.com ή 192.168.2.1"
-
-#: ../src/gnome-nettool.ui.h:25
-msgid "Enter the network address to scan for open ports. For example: www.domain.com or 192.168.2.1"
-msgstr "Î?ιÏ?άγεÏ?ε Ï?η διεÏ?θÏ?νÏ?η δικÏ?Ï?οÏ? για Ï?άÏ?Ï?Ï?η ανοικÏ?Ï?ν θÏ?Ï?Ï?ν. Î?ια Ï?αÏ?άδειγμα: www.domain.com ή 192.168.2.1"
-
-#: ../src/gnome-nettool.ui.h:26
-msgid "Enter the network address to trace a route to. For example: www.domain.com or 192.168.2.1"
-msgstr "Î?ιÏ?άγεÏ?ε Ï?η διεÏ?θÏ?νÏ?η δικÏ?Ï?οÏ? για trace a route to. Î?ια Ï?αÏ?άδειγμα: www.domain.com ή 192.168.2.1"
+#: ../data/gnome-nettool.ui.h:21
+msgid ""
+"Enter a domain address to lookup its whois information. For example: www."
+"domain.com or 192.168.2.1"
+msgstr ""
+"Î?ιÏ?άγεÏ?ε μια διεÏ?θÏ?νÏ?η δικÏ?Ï?οÏ? για αναζήÏ?ηÏ?η Ï?ληÏ?οÏ?οÏ?ιÏ?ν whois. Î?ια "
+"Ï?αÏ?άδειγμα: www.domain.com ή 192.168.2.1"
+
+#: ../data/gnome-nettool.ui.h:22
+msgid ""
+"Enter the network address to finger that user. For example: www.domain.com "
+"or 192.168.2.1"
+msgstr ""
+"Î?ιÏ?άγεÏ?ε Ï?η διεÏ?θÏ?νÏ?η δικÏ?Ï?οÏ? για να κάνεÏ?ε finger αÏ?Ï?Ï? Ï?ο Ï?Ï?ήÏ?Ï?η. Î?ια "
+"Ï?αÏ?άδειγμα: auth.domain.com ή 192.168.2.1"
+
+#: ../data/gnome-nettool.ui.h:23
+msgid ""
+"Enter the network address to lookup. For example: www.domain.com or "
+"192.168.2.1"
+msgstr ""
+"Î?ιÏ?άγεÏ?ε Ï?η διεÏ?θÏ?νÏ?η δικÏ?Ï?οÏ? για lookup. Î?ια Ï?αÏ?άδειγμα: www.domain.com ή "
+"192.168.2.1"
+
+#: ../data/gnome-nettool.ui.h:24
+msgid ""
+"Enter the network address to ping. For example: www.domain.com or 192.168.2.1"
+msgstr ""
+"Î?ιÏ?άγεÏ?ε Ï?η διεÏ?θÏ?νÏ?η δικÏ?Ï?οÏ? για ping. Î?ια Ï?αÏ?άδειγμα: www.domain.com ή "
+"192.168.2.1"
+
+#: ../data/gnome-nettool.ui.h:25
+msgid ""
+"Enter the network address to scan for open ports. For example: www.domain."
+"com or 192.168.2.1"
+msgstr ""
+"Î?ιÏ?άγεÏ?ε Ï?η διεÏ?θÏ?νÏ?η δικÏ?Ï?οÏ? για Ï?άÏ?Ï?Ï?η ανοικÏ?Ï?ν θÏ?Ï?Ï?ν. Î?ια Ï?αÏ?άδειγμα: www."
+"domain.com ή 192.168.2.1"
+
+#: ../data/gnome-nettool.ui.h:26
+msgid ""
+"Enter the network address to trace a route to. For example: www.domain.com "
+"or 192.168.2.1"
+msgstr ""
+"Î?ιÏ?άγεÏ?ε Ï?η διεÏ?θÏ?νÏ?η δικÏ?Ï?οÏ? για trace a route to. Î?ια Ï?αÏ?άδειγμα: www."
+"domain.com ή 192.168.2.1"
-#: ../src/gnome-nettool.ui.h:27
+#: ../data/gnome-nettool.ui.h:27
msgid "Enter the user to finger"
msgstr "Î?ιÏ?άγεÏ?ε Ï?ο Ï?Ï?ήÏ?Ï?η για finger "
-#: ../src/gnome-nettool.ui.h:28
-#: ../src/main.c:814
+#: ../data/gnome-nettool.ui.h:28 ../src/main.c:814
msgid "Finger"
msgstr "Finger"
-#: ../src/gnome-nettool.ui.h:29
+#: ../data/gnome-nettool.ui.h:29
msgid "Finger output"
msgstr "αÏ?οÏ?ÎλεÏ?μα finger"
-#: ../src/gnome-nettool.ui.h:30
+#: ../data/gnome-nettool.ui.h:30
msgid "Hardware address:"
msgstr "Î?ιεÏ?θÏ?νÏ?η Ï?λικοÏ?:"
-#: ../src/gnome-nettool.ui.h:31
+#: ../data/gnome-nettool.ui.h:31
msgid "Host"
msgstr "ΣÏ?Ï?Ï?ημα"
-#: ../src/gnome-nettool.ui.h:32
+#: ../data/gnome-nettool.ui.h:32
msgid "Link speed:"
msgstr "ΤαÏ?Ï?Ï?ηÏ?α Ï?Ï?νδεÏ?ηÏ?:"
-#: ../src/gnome-nettool.ui.h:33
-#: ../src/main.c:734
+#: ../data/gnome-nettool.ui.h:33 ../src/main.c:734
msgid "Lookup"
msgstr "Lookup"
-#: ../src/gnome-nettool.ui.h:34
+#: ../data/gnome-nettool.ui.h:34
msgid "Lookup output"
msgstr "αÏ?οÏ?ÎλεÏ?μα lookup"
-#: ../src/gnome-nettool.ui.h:35
+#: ../data/gnome-nettool.ui.h:35
msgid "MTU:"
msgstr "MTU:"
-#: ../src/gnome-nettool.ui.h:36
+#: ../data/gnome-nettool.ui.h:36
msgid "Maximum:"
msgstr "Î?ÎγιÏ?Ï?ο:"
-#: ../src/gnome-nettool.ui.h:37
+#: ../data/gnome-nettool.ui.h:37
msgid "Minimum:"
msgstr "Î?λάÏ?ιÏ?Ï?ο:"
-#: ../src/gnome-nettool.ui.h:38
+#: ../data/gnome-nettool.ui.h:38
msgid "Multicast Information"
msgstr "ΠληÏ?οÏ?οÏ?ίεÏ? Multicast "
-#: ../src/gnome-nettool.ui.h:39
+#: ../data/gnome-nettool.ui.h:39
msgid "Multicast:"
msgstr "Multicast:"
-#: ../src/gnome-nettool.ui.h:40
-#: ../src/main.c:446
+#: ../data/gnome-nettool.ui.h:40 ../src/main.c:446
msgid "Netstat"
msgstr "Netstat"
-#: ../src/gnome-nettool.ui.h:41
+#: ../data/gnome-nettool.ui.h:41
msgid "Netstat output"
msgstr "Î?Ï?οÏ?ÎλεÏ?μα netstat"
-#: ../src/gnome-nettool.ui.h:42
+#: ../data/gnome-nettool.ui.h:42
msgid "Network address"
msgstr "Î?ιεÏ?θÏ?νÏ?η δικÏ?Ï?οÏ?"
-#: ../src/gnome-nettool.ui.h:43
+#: ../data/gnome-nettool.ui.h:43
msgid "Not Available"
msgstr "Î?η Î?ιαθÎÏ?ιμη"
-#: ../src/gnome-nettool.ui.h:44
+#: ../data/gnome-nettool.ui.h:44
msgid "Only"
msgstr "Î?Ï?νο"
-#: ../src/gnome-nettool.ui.h:45
+#: ../data/gnome-nettool.ui.h:45
msgid "Output for finger"
msgstr "Î?Ï?οÏ?ÎλεÏ?μα finger"
-#: ../src/gnome-nettool.ui.h:46
+#: ../data/gnome-nettool.ui.h:46
msgid "Output for lookup"
msgstr "Î?Ï?οÏ?ÎλεÏ?μα lookup"
-#: ../src/gnome-nettool.ui.h:47
+#: ../data/gnome-nettool.ui.h:47
msgid "Output for net stat"
msgstr "Î?Ï?οÏ?ÎλεÏ?μα net stat"
-#: ../src/gnome-nettool.ui.h:48
+#: ../data/gnome-nettool.ui.h:48
msgid "Output for port scan"
msgstr "Î?Ï?οÏ?ÎλεÏ?μα Ï?άÏ?Ï?Ï?ηÏ? θÏ?Ï?αÏ?"
-#: ../src/gnome-nettool.ui.h:49
+#: ../data/gnome-nettool.ui.h:49
msgid "Output for traceroute"
msgstr "Î?Ï?οÏ?ÎλεÏ?μα traceroute"
-#: ../src/gnome-nettool.ui.h:50
+#: ../data/gnome-nettool.ui.h:50
msgid "Output for whois"
msgstr "Î?Ï?οÏ?ÎλεÏ?μα whois"
-#: ../src/gnome-nettool.ui.h:51
+#: ../data/gnome-nettool.ui.h:51
msgid "Packets received:"
msgstr "Î?ιÏ?εÏ?Ï?Ï?μενα Ï?ακÎÏ?α:"
-#: ../src/gnome-nettool.ui.h:52
+#: ../data/gnome-nettool.ui.h:52
msgid "Packets transmitted:"
msgstr "Î?ξεÏ?Ï?Ï?μενα Ï?ακÎÏ?α:"
-#: ../src/gnome-nettool.ui.h:53
-#: ../src/main.c:290
+#: ../data/gnome-nettool.ui.h:53 ../src/main.c:290
msgid "Ping"
msgstr "Ping"
-#: ../src/gnome-nettool.ui.h:54
+#: ../data/gnome-nettool.ui.h:54
msgid "Port Scan"
msgstr "ΣάÏ?Ï?Ï?η θÏ?Ï?αÏ?"
-#: ../src/gnome-nettool.ui.h:55
+#: ../data/gnome-nettool.ui.h:55
msgid "Port scan output"
msgstr "Î?Ï?οÏ?ÎλεÏ?μα Ï?άÏ?Ï?Ï?ηÏ? θÏ?Ï?αÏ?"
-#: ../src/gnome-nettool.ui.h:56
+#: ../data/gnome-nettool.ui.h:56
msgid "Received bytes:"
msgstr "Î?ιÏ?εÏ?Ï?Ï?μενα bytes:"
-#: ../src/gnome-nettool.ui.h:57
+#: ../data/gnome-nettool.ui.h:57
msgid "Received packets:"
msgstr "Î?ιÏ?εÏ?Ï?Ï?μενα Ï?ακÎÏ?α:"
-#: ../src/gnome-nettool.ui.h:58
+#: ../data/gnome-nettool.ui.h:58
msgid "Reception errors:"
msgstr "ΣÏ?άλμαÏ?α λήÏ?ηÏ?:"
-#: ../src/gnome-nettool.ui.h:59
+#: ../data/gnome-nettool.ui.h:59
msgid "Routing Table Information"
msgstr "ΠληÏ?οÏ?οÏ?ίεÏ? routing table "
-#: ../src/gnome-nettool.ui.h:60
-#: ../src/main.c:619
+#: ../data/gnome-nettool.ui.h:60 ../src/main.c:619
msgid "Scan"
msgstr "ΣάÏ?Ï?Ï?η"
-#: ../src/gnome-nettool.ui.h:61
+#: ../data/gnome-nettool.ui.h:61
msgid "Send:"
msgstr "Î?Ï?οÏ?Ï?ολή:"
-#: ../src/gnome-nettool.ui.h:62
+#: ../data/gnome-nettool.ui.h:62
msgid "State:"
msgstr "Î?αÏ?άÏ?Ï?αÏ?η:"
-#: ../src/gnome-nettool.ui.h:63
+#: ../data/gnome-nettool.ui.h:63
msgid "Successful packets:"
msgstr "Î?Ï?ιÏ?Ï?Ï?ημÎνα Ï?ακÎÏ?α:"
-#: ../src/gnome-nettool.ui.h:64
-#: ../src/main.c:375
+#: ../data/gnome-nettool.ui.h:64 ../src/main.c:375
msgid "Trace"
msgstr "Trace"
-#: ../src/gnome-nettool.ui.h:65
+#: ../data/gnome-nettool.ui.h:65
msgid "Traceroute"
msgstr "Traceroute"
-#: ../src/gnome-nettool.ui.h:66
+#: ../data/gnome-nettool.ui.h:66
msgid "Traceroute output"
msgstr "Î?Ï?οÏ?ÎλεÏ?μα traceroute"
-#: ../src/gnome-nettool.ui.h:67
+#: ../data/gnome-nettool.ui.h:67
msgid "Transmission errors:"
msgstr "ΣÏ?άλμαÏ?α μεÏ?άδοÏ?ηÏ?:"
-#: ../src/gnome-nettool.ui.h:68
+#: ../data/gnome-nettool.ui.h:68
msgid "Transmitted bytes:"
msgstr "Î?ξεÏ?Ï?Ï?μενα Bytes:"
-#: ../src/gnome-nettool.ui.h:69
+#: ../data/gnome-nettool.ui.h:69
msgid "Transmitted packets:"
msgstr "Î?ξεÏ?Ï?Ï?μενα Ï?ακÎÏ?α:"
-#: ../src/gnome-nettool.ui.h:70
+#: ../data/gnome-nettool.ui.h:70
msgid "Unlimited requests"
msgstr "Î?Ï?εÏ?ιÏ?Ï?ιÏ?Ï?εÏ? αιÏ?ήÏ?ειÏ?"
-#: ../src/gnome-nettool.ui.h:71
+#: ../data/gnome-nettool.ui.h:71
msgid "User"
msgstr "ΧÏ?ήÏ?Ï?ηÏ?"
-#: ../src/gnome-nettool.ui.h:72
+#: ../data/gnome-nettool.ui.h:72
msgid "User name"
msgstr "Î?νομα ΧÏ?ήÏ?Ï?η"
-#: ../src/gnome-nettool.ui.h:73
-#: ../src/main.c:920
+#: ../data/gnome-nettool.ui.h:73 ../src/main.c:920
msgid "Whois"
msgstr "Whois"
-#: ../src/gnome-nettool.ui.h:74
+#: ../data/gnome-nettool.ui.h:74
msgid "Whois output"
msgstr "Î?Ï?οÏ?ÎλεÏ?μα whois"
-#: ../src/gnome-nettool.ui.h:75
+#: ../data/gnome-nettool.ui.h:75
msgid "_Configure"
msgstr "_ΡÏ?θμιÏ?η"
-#: ../src/gnome-nettool.ui.h:76
+#: ../data/gnome-nettool.ui.h:76
msgid "_Domain address:"
msgstr "Î?ιεÏ?θÏ?νÏ?η Ï?ο_μÎα:"
-#: ../src/gnome-nettool.ui.h:77
+#: ../data/gnome-nettool.ui.h:77
msgid "_Edit"
msgstr "_Î?Ï?εξεÏ?γαÏ?ία"
-#: ../src/gnome-nettool.ui.h:78
+#: ../data/gnome-nettool.ui.h:78
msgid "_Help"
msgstr "_Î?οήθεια"
-#: ../src/gnome-nettool.ui.h:79
+#: ../data/gnome-nettool.ui.h:79
msgid "_Information type:"
msgstr "ΤÏ?Ï?οÏ? ΠληÏ?ο_Ï?οÏ?ιÏ?ν:"
-#: ../src/gnome-nettool.ui.h:80
+#: ../data/gnome-nettool.ui.h:80
msgid "_Network address:"
msgstr "Î?ιεÏ?θÏ?νÏ?η _δικÏ?Ï?οÏ?:"
-#: ../src/gnome-nettool.ui.h:81
+#: ../data/gnome-nettool.ui.h:81
msgid "_Network device:"
msgstr "ΣÏ?Ï?κεÏ?ή _δίκÏ?Ï?οÏ?:"
-#: ../src/gnome-nettool.ui.h:82
+#: ../data/gnome-nettool.ui.h:82
msgid "_Tool"
msgstr "_Î?Ï?γαλείο"
-#: ../src/gnome-nettool.ui.h:83
+#: ../data/gnome-nettool.ui.h:83
msgid "_Username:"
msgstr "_Î?νομα ΧÏ?ήÏ?Ï?η:"
-#: ../src/gnome-nettool.ui.h:84
+#: ../data/gnome-nettool.ui.h:84
msgid "ms"
msgstr "ms"
-#: ../src/gnome-nettool.ui.h:85
+#: ../data/gnome-nettool.ui.h:85
msgid "requests"
msgstr "αιÏ?ήÏ?ειÏ?"
@@ -442,8 +486,7 @@ msgstr "Î?γνÏ?Ï?Ï?η Î?ιεÏ?αÏ?ή"
msgid "Network Devices Not Found"
msgstr "Î?εν βÏ?Îθηκαν Ï?Ï?Ï?κεÏ?ÎÏ? δικÏ?Ï?οÏ?"
-#: ../src/info.c:392
-#: ../src/info.c:395
+#: ../src/info.c:392 ../src/info.c:395
msgid "Unknown"
msgstr "Î?γνÏ?Ï?Ï?ο"
@@ -575,16 +618,14 @@ msgstr "ΣΥΣÎ?Î?Î¥Î?"
msgid "Send a ping to a network address"
msgstr "Î?Ï?οÏ?Ï?ολή ping Ï?ε μια διεÏ?θÏ?νÏ?η δικÏ?Ï?οÏ?"
-#: ../src/main.c:87
-#: ../src/main.c:95
-#: ../src/main.c:99
-#: ../src/main.c:103
+#: ../src/main.c:87 ../src/main.c:95 ../src/main.c:99 ../src/main.c:103
msgid "HOST"
msgstr "HOST"
#: ../src/main.c:90
msgid "Get netstat information. Valid options are: route, active, multicast."
-msgstr "Î?ήÏ?η Ï?ληÏ?οÏ?οÏ?ιÏ?ν netstat. Î?γκÏ?Ï?εÏ? εÏ?ιλογÎÏ? είναι: route, active, multicast."
+msgstr ""
+"Î?ήÏ?η Ï?ληÏ?οÏ?οÏ?ιÏ?ν netstat. Î?γκÏ?Ï?εÏ? εÏ?ιλογÎÏ? είναι: route, active, multicast."
#: ../src/main.c:91
msgid "COMMAND"
@@ -620,11 +661,13 @@ msgstr "ΤÎ?Î?Î?Î?Σ"
#: ../src/main.c:130
#, c-format
-msgid "The file %s doesn't exist, please check if gnome-nettool is correctly installed"
-msgstr "Το αÏ?Ï?είο %s δεν Ï?Ï?άÏ?Ï?ει, ελÎγξÏ?ε αν Ï?ο gnome-nettool ÎÏ?ει εγκαÏ?αÏ?Ï?αθεί Ï?Ï?Ï?Ï?ά"
+msgid ""
+"The file %s doesn't exist, please check if gnome-nettool is correctly "
+"installed"
+msgstr ""
+"Το αÏ?Ï?είο %s δεν Ï?Ï?άÏ?Ï?ει, ελÎγξÏ?ε αν Ï?ο gnome-nettool ÎÏ?ει εγκαÏ?αÏ?Ï?αθεί Ï?Ï?Ï?Ï?ά"
-#: ../src/main.c:482
-#: ../src/netstat.c:443
+#: ../src/main.c:482 ../src/netstat.c:443
msgid "Protocol"
msgstr "Î Ï?Ï?Ï?Ï?κολλο"
@@ -714,8 +757,7 @@ msgstr "Πηγή IP"
msgid "Port/Service"
msgstr "Î?Ï?Ï?α/Î¥Ï?ηÏ?εÏ?ία"
-#: ../src/netstat.c:466
-#: ../src/scan.c:314
+#: ../src/netstat.c:466 ../src/scan.c:314
msgid "State"
msgstr "Î?αÏ?άÏ?Ï?αÏ?η"
@@ -735,8 +777,7 @@ msgstr "Gateway"
msgid "Netmask"
msgstr "Netmask"
-#: ../src/netstat.c:634
-#: ../src/netstat.c:741
+#: ../src/netstat.c:634 ../src/netstat.c:741
msgid "Interface"
msgstr "Î?ιεÏ?αÏ?ή"
@@ -772,8 +813,7 @@ msgstr "Î?ιεÏ?αÏ?ή\tÎ?ÎλοÏ?\tÎ?μ
msgid "A network address was not specified"
msgstr "Î?εν καθοÏ?ίÏ?Ï?ηκε μια διεÏ?θÏ?νÏ?η δικÏ?Ï?οÏ?"
-#: ../src/nettool.c:200
-#: ../src/nettool.c:209
+#: ../src/nettool.c:200 ../src/nettool.c:209
msgid "Please enter a valid network address and try again."
msgstr "ΠαÏ?ακαλÏ? ειÏ?άγεÏ?ε μιά ÎγκÏ?Ï?η διεÏ?θÏ?νÏ?η δικÏ?Ï?οÏ? και δοκιμάÏ?Ï?ε ξανά."
@@ -939,12 +979,12 @@ msgstr "Hop\tÎ?νομα Ï?Ï?Ï?Ï?ήμαÏ?
#: ../src/utils.c:227
#, c-format
-msgid "In order to use this feature of the program, %s must be installed in your system"
-msgstr "Î?ια να Ï?Ï?ηÏ?ιμοÏ?οιήÏ?εÏ?ε αÏ?Ï?ή Ï?η λειÏ?οÏ?Ï?γιοÏ? Ï?οÏ? Ï?Ï?ογÏ?άμμαÏ?οÏ?, θα Ï?Ï?ÎÏ?ει να είναι εγκαÏ?εÏ?Ï?ημÎνο Ï?Ï?ο Ï?Ï?Ï?Ï?ημα Ï?αÏ? Ï?ο %s."
-
-#: ../src/gnome-nettool.desktop.in.in.h:2
-msgid "View information about your network"
-msgstr "Î Ï?οβολή Ï?ληÏ?οÏ?οÏ?ιÏ?ν για Ï?ο δίκÏ?Ï?ο Ï?αÏ?"
+msgid ""
+"In order to use this feature of the program, %s must be installed in your "
+"system"
+msgstr ""
+"Î?ια να Ï?Ï?ηÏ?ιμοÏ?οιήÏ?εÏ?ε αÏ?Ï?ή Ï?η λειÏ?οÏ?Ï?γιοÏ? Ï?οÏ? Ï?Ï?ογÏ?άμμαÏ?οÏ?, θα Ï?Ï?ÎÏ?ει να "
+"είναι εγκαÏ?εÏ?Ï?ημÎνο Ï?Ï?ο Ï?Ï?Ï?Ï?ημα Ï?αÏ? Ï?ο %s."
#: ../src/finger.c:63
#, c-format
@@ -963,20 +1003,27 @@ msgstr "Î?ήÏ?η Ï?ληÏ?οÏ?οÏ?ιÏ?ν
#~ msgid "Broadcast:"
#~ msgstr "Î?εÏ?άδοÏ?η:"
+
#~ msgid "IP Address:"
#~ msgstr "Î?ιεÏ?θÏ?νÏ?η IP:"
+
#~ msgid "Netmask:"
#~ msgstr "Netmask:"
+
#~ msgid "IP address:\t%s\n"
#~ msgstr "Î?ιεÏ?θÏ?νÏ?η IP:\t%s\n"
+
#~ msgid "Netmask:\t%s\n"
#~ msgstr "Netmask:\t%s\n"
+
#~ msgid "Broadcast:\t%s\n"
#~ msgstr "Î?εÏ?άδοÏ?η:\t%s\n"
+
#~ msgid "Packets loss:"
#~ msgstr "ΧαμÎνα Ï?ακÎÏ?α:"
+
#~ msgid "Packet loss:\t%s\n"
#~ msgstr "ΠακÎÏ?α Ï?οÏ? Ï?άθηκαν:\t%s\n"
+
#~ msgid "Network Information Tools"
#~ msgstr "Î?Ï?γαλεία Ï?ληÏ?οÏ?οÏ?ίÏ?ν δικÏ?Ï?οÏ?"
-
diff -pruN 3.0.0-2/po/eo.po 3.0.1-0ubuntu1/po/eo.po
--- 3.0.0-2/po/eo.po 1970-01-01 00:00:00.000000000 +0000
+++ 3.0.1-0ubuntu1/po/eo.po 2011-12-31 23:54:24.000000000 +0000
@@ -0,0 +1,983 @@
+# Esperanto translation for gnome-nettool
+# Copyright (c) 2011 Canonical Ltd, and Rosetta Contributors 2011
+# This file is distributed under the same license as the gnome-nettool package.
+#
+# Kristjan SCHMIDT <kristjan schmidt googlemail com>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnome-nettool\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
+"nettool&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-04-04 08:46+0000\n"
+"PO-Revision-Date: 2011-04-09 20:02+0200\n"
+"Last-Translator: Kristjan SCHMIDT <kristjan schmidt googlemail com>\n"
+"Language-Team: Esperanto <ubuntu-l10n-eo lists launchpad net>\n"
+"Language: eo\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-04-09 18:00+0000\n"
+"X-Generator: Launchpad (build 12757)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ../src/callbacks.c:332
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+" Kristjan SCHMIDT https://launchpad.net/~kristjan-eo";
+
+#. Translators: %s is the name of the copyright holder
+#: ../src/callbacks.c:339
+#, c-format
+msgid "Copyright © 2003-2008 %s"
+msgstr "Kopirajto © 2003-2008 %s"
+
+#. Dear translator: This is the name of the application
+#: ../src/callbacks.c:343 ../src/callbacks.c:344
+#: ../data/gnome-nettool.desktop.in.in.h:1
+msgid "Network Tools"
+msgstr "Retiloj"
+
+#: ../src/callbacks.c:346
+msgid "Graphical user interface for common network utilities"
+msgstr ""
+
+#: ../src/callbacks.c:458 ../src/main.c:142 ../src/nettool.c:483
+msgid "Idle"
+msgstr "Senokupe"
+
+#. Dear Translator: This is the Window Title. 'Network Tools' is the
+#. * name of the application
+#: ../src/callbacks.c:463
+#, c-format
+msgid "%s - Network Tools"
+msgstr "%s - Retiloj"
+
+#: ../src/callbacks.c:487
+msgid "Unable to open help file"
+msgstr "Ne eblas malfermi helpdosieron"
+
+#: ../data/gnome-nettool.desktop.in.in.h:2
+msgid "View information about your network"
+msgstr ""
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:1
+msgid "A list of domains previously used"
+msgstr ""
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:2
+msgid "A list of hostnames previously used"
+msgstr ""
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:3
+msgid "A list of usernames previously used"
+msgstr ""
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:4
+msgid "Historically used domains"
+msgstr ""
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:5
+msgid "Historically used hostnames"
+msgstr ""
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:6
+msgid "Historically used usernames"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:1
+msgid "0"
+msgstr "0"
+
+#: ../data/gnome-nettool.ui.h:3
+#, no-c-format
+msgid "0%"
+msgstr "0%"
+
+#: ../data/gnome-nettool.ui.h:4
+msgid "0.0"
+msgstr "0.0"
+
+#: ../data/gnome-nettool.ui.h:5
+msgid "<b>IP Information</b>"
+msgstr "<b>IP-informo</b>"
+
+#: ../data/gnome-nettool.ui.h:6
+msgid "<b>Interface Information</b>"
+msgstr "<b>Interfaco-informo</b>"
+
+#: ../data/gnome-nettool.ui.h:7
+msgid "<b>Interface Statistics</b>"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:8
+msgid "<b>Round Trip Time Statistics</b>"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:9
+msgid "<b>Transmission Statistics</b>"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:10
+msgid "Active Network Services"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:11
+msgid "Average:"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:12
+msgid "Beep on ping"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:13
+msgid "Clear _History"
+msgstr "Vakigi _historion"
+
+#: ../data/gnome-nettool.ui.h:14
+msgid "Collisions:"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:15
+msgid "Copy as text _report"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:16
+msgid "Details"
+msgstr "Detaloj"
+
+#: ../data/gnome-nettool.ui.h:17
+msgid "Devices"
+msgstr "Aparatoj"
+
+#: ../data/gnome-nettool.ui.h:18
+msgid "Devices - Network Tools"
+msgstr "Aparatoj - Retiloj"
+
+#: ../data/gnome-nettool.ui.h:19
+msgid "Display:"
+msgstr "Montri:"
+
+#: ../data/gnome-nettool.ui.h:20
+msgid "Domain address"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:21
+msgid ""
+"Enter a domain address to lookup its whois information. For example: www."
+"domain.com or 192.168.2.1"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:22
+msgid ""
+"Enter the network address to finger that user. For example: www.domain.com "
+"or 192.168.2.1"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:23
+msgid ""
+"Enter the network address to lookup. For example: www.domain.com or "
+"192.168.2.1"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:24
+msgid ""
+"Enter the network address to ping. For example: www.domain.com or 192.168.2.1"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:25
+msgid ""
+"Enter the network address to scan for open ports. For example: www.domain."
+"com or 192.168.2.1"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:26
+msgid ""
+"Enter the network address to trace a route to. For example: www.domain.com "
+"or 192.168.2.1"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:27
+msgid "Enter the user to finger"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:28 ../src/main.c:812
+msgid "Finger"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:29
+msgid "Finger output"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:30
+msgid "Hardware address:"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:31
+msgid "Host"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:32
+msgid "Link speed:"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:33 ../src/main.c:732
+msgid "Lookup"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:34
+msgid "Lookup output"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:35
+msgid "MTU:"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:36
+msgid "Maximum:"
+msgstr "Maksimumo:"
+
+#: ../data/gnome-nettool.ui.h:37
+msgid "Minimum:"
+msgstr "Minimumo:"
+
+#: ../data/gnome-nettool.ui.h:38
+msgid "Multicast Information"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:39
+msgid "Multicast:"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:40 ../src/main.c:446
+msgid "Netstat"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:41
+msgid "Netstat output"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:42
+msgid "Network address"
+msgstr "Retadreso"
+
+#: ../data/gnome-nettool.ui.h:43
+msgid "Not Available"
+msgstr "Nedisponeble"
+
+#: ../data/gnome-nettool.ui.h:44
+msgid "Only"
+msgstr "Nur"
+
+#: ../data/gnome-nettool.ui.h:45
+msgid "Output for finger"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:46
+msgid "Output for lookup"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:47
+msgid "Output for net stat"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:48
+msgid "Output for port scan"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:49
+msgid "Output for traceroute"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:50
+msgid "Output for whois"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:51
+msgid "Packets received:"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:52
+msgid "Packets transmitted:"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:53 ../src/main.c:290
+msgid "Ping"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:54
+msgid "Port Scan"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:55
+msgid "Port scan output"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:56
+msgid "Received bytes:"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:57
+msgid "Received packets:"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:58
+msgid "Reception errors:"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:59
+msgid "Routing Table Information"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:60 ../src/main.c:617
+msgid "Scan"
+msgstr "Skani"
+
+#: ../data/gnome-nettool.ui.h:61
+msgid "Send:"
+msgstr "Sendi:"
+
+#: ../data/gnome-nettool.ui.h:62
+msgid "State:"
+msgstr "Stato:"
+
+#: ../data/gnome-nettool.ui.h:63
+msgid "Successful packets:"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:64 ../src/main.c:375
+msgid "Trace"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:65
+msgid "Traceroute"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:66
+msgid "Traceroute output"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:67
+msgid "Transmission errors:"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:68
+msgid "Transmitted bytes:"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:69
+msgid "Transmitted packets:"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:70
+msgid "Unlimited requests"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:71
+msgid "User"
+msgstr "Uzanto"
+
+#: ../data/gnome-nettool.ui.h:72
+msgid "User name"
+msgstr "Uzantonomo"
+
+#: ../data/gnome-nettool.ui.h:73 ../src/main.c:918
+msgid "Whois"
+msgstr "Kiu-estas"
+
+#: ../data/gnome-nettool.ui.h:74
+msgid "Whois output"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:75
+msgid "_Configure"
+msgstr "_Agordi"
+
+#: ../data/gnome-nettool.ui.h:76
+msgid "_Domain address:"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:77
+msgid "_Edit"
+msgstr "R_edakti"
+
+#: ../data/gnome-nettool.ui.h:78
+msgid "_Help"
+msgstr "_Helpo"
+
+#: ../data/gnome-nettool.ui.h:79
+msgid "_Information type:"
+msgstr ""
+
+#: ../data/gnome-nettool.ui.h:80
+msgid "_Network address:"
+msgstr "_Retadreso:"
+
+#: ../data/gnome-nettool.ui.h:81
+msgid "_Network device:"
+msgstr "_Retaparato:"
+
+#: ../data/gnome-nettool.ui.h:82
+msgid "_Tool"
+msgstr "_Ilo"
+
+#: ../data/gnome-nettool.ui.h:83
+msgid "_Username:"
+msgstr "_Uzantonomo:"
+
+#: ../data/gnome-nettool.ui.h:84
+msgid "ms"
+msgstr "ms"
+
+#: ../data/gnome-nettool.ui.h:85
+msgid "requests"
+msgstr ""
+
+#. Interface Name Interface Type icon Device prefix Pixbuf
+#: ../src/info.c:60
+msgid "Other type"
+msgstr "Alia tipo"
+
+#: ../src/info.c:61
+msgid "Ethernet Interface"
+msgstr ""
+
+#: ../src/info.c:62
+msgid "Wireless Interface"
+msgstr "Sendrata interfaco"
+
+#: ../src/info.c:63
+msgid "Modem Interface"
+msgstr ""
+
+#: ../src/info.c:64
+msgid "Parallel Line Interface"
+msgstr ""
+
+#: ../src/info.c:65
+msgid "Infrared Interface"
+msgstr ""
+
+#: ../src/info.c:66
+msgid "Loopback Interface"
+msgstr ""
+
+#: ../src/info.c:67
+msgid "Unknown Interface"
+msgstr "Nekonata interfaco"
+
+#: ../src/info.c:165
+msgid "Network Devices Not Found"
+msgstr ""
+
+#: ../src/info.c:400 ../src/info.c:403
+msgid "Unknown"
+msgstr "Nekonate"
+
+#: ../src/info.c:474
+msgid "Active"
+msgstr "Aktive"
+
+#: ../src/info.c:476
+msgid "Inactive"
+msgstr "Neaktive"
+
+#: ../src/info.c:481
+msgid "Loopback"
+msgstr "Inversa ciklo"
+
+#: ../src/info.c:490
+msgid "Enabled"
+msgstr "EnÅ?altite"
+
+#: ../src/info.c:492
+msgid "Disabled"
+msgstr "ElÅ?altite"
+
+#. The info output in a text format (to copy on clipboard)
+#: ../src/info.c:581
+#, c-format
+msgid "Network device:\t%s\n"
+msgstr "Retaparato:\t%s\n"
+
+#: ../src/info.c:582
+#, c-format
+msgid "Hardware address:\t%s\n"
+msgstr ""
+
+#: ../src/info.c:583
+#, c-format
+msgid "Multicast:\t%s\n"
+msgstr ""
+
+#: ../src/info.c:584
+#, c-format
+msgid "MTU:\t%s\n"
+msgstr ""
+
+#: ../src/info.c:585
+#, c-format
+msgid "Link speed:\t%s\n"
+msgstr ""
+
+#: ../src/info.c:586
+#, c-format
+msgid "State:\t%s\n"
+msgstr "Stato:\t%s\n"
+
+#: ../src/info.c:588
+#, c-format
+msgid "Transmitted packets:\t%s\n"
+msgstr ""
+
+#: ../src/info.c:589
+#, c-format
+msgid "Transmission errors:\t%s\n"
+msgstr ""
+
+#: ../src/info.c:590
+#, c-format
+msgid "Received packets:\t%s\n"
+msgstr ""
+
+#: ../src/info.c:591
+#, c-format
+msgid "Reception errors:\t%s\n"
+msgstr ""
+
+#: ../src/info.c:592
+#, c-format
+msgid "Collisions:\t%s\n"
+msgstr ""
+
+#: ../src/info.h:27
+msgid "not available"
+msgstr "nedisponeble"
+
+#: ../src/lookup.c:80
+#, c-format
+msgid "Looking up %s"
+msgstr ""
+
+#: ../src/lookup.c:274
+msgid "Name"
+msgstr "Nomo"
+
+#. Time To Live of a hostname in a name server
+#: ../src/lookup.c:283
+msgid "TTL"
+msgstr ""
+
+#: ../src/lookup.c:292
+msgid "Address Type"
+msgstr "Adrestipo"
+
+#: ../src/lookup.c:302
+msgid "Record Type"
+msgstr ""
+
+#: ../src/lookup.c:311
+msgid "Address"
+msgstr "Adreso"
+
+#. The lookup output in text format:
+#. Source of query (hostname/ip address),
+#. Time To Live (TTL), Address Type,
+#. Record Type (A, PTR, HINFO, NS, TXT, etc.),
+#. Resolution (results of the query)
+#. It's a tabular output, and these belongs to the column titles
+#: ../src/lookup.c:339
+msgid "Source\tTTL\tAddress Type\tRecord Type1\tResolution\n"
+msgstr ""
+
+#: ../src/main.c:82
+msgid "Load information for a network device"
+msgstr ""
+
+#: ../src/main.c:83
+msgid "DEVICE"
+msgstr "APARATO"
+
+#: ../src/main.c:86
+msgid "Send a ping to a network address"
+msgstr ""
+
+#: ../src/main.c:87 ../src/main.c:95 ../src/main.c:99 ../src/main.c:103
+msgid "HOST"
+msgstr ""
+
+#: ../src/main.c:90
+msgid "Get netstat information. Valid options are: route, active, multicast."
+msgstr ""
+
+#: ../src/main.c:91
+msgid "COMMAND"
+msgstr "KOMANDO"
+
+#: ../src/main.c:94
+msgid "Trace a route to a network address"
+msgstr ""
+
+#: ../src/main.c:98
+msgid "Port scan a network address"
+msgstr ""
+
+#: ../src/main.c:102
+msgid "Look up a network address"
+msgstr ""
+
+#: ../src/main.c:106
+msgid "Finger command to run"
+msgstr ""
+
+#: ../src/main.c:107
+msgid "USER"
+msgstr "UZANTO"
+
+#: ../src/main.c:110
+msgid "Perform a whois lookup for a network domain"
+msgstr ""
+
+#: ../src/main.c:111
+msgid "DOMAIN"
+msgstr "DOMAJNO"
+
+#: ../src/main.c:130
+#, c-format
+msgid ""
+"The file %s doesn't exist, please check if gnome-nettool is correctly "
+"installed"
+msgstr ""
+
+#: ../src/main.c:482 ../src/netstat.c:443
+msgid "Protocol"
+msgstr "Protokolo"
+
+#: ../src/main.c:489
+msgid "IP Address"
+msgstr "IP-adreso"
+
+#: ../src/main.c:496
+msgid "Netmask / Prefix"
+msgstr ""
+
+#: ../src/main.c:503
+msgid "Broadcast"
+msgstr ""
+
+#: ../src/main.c:510
+msgid "Scope"
+msgstr ""
+
+#: ../src/main.c:667
+msgid "Default Information"
+msgstr ""
+
+#: ../src/main.c:668
+msgid "Internet Address"
+msgstr "Interretadreso"
+
+#: ../src/main.c:669
+msgid "Canonical Name"
+msgstr ""
+
+#: ../src/main.c:670
+msgid "CPU / OS Type"
+msgstr ""
+
+#. When asking for MX record in DNS context
+#: ../src/main.c:672
+msgid "Mailbox Exchange"
+msgstr ""
+
+#: ../src/main.c:673
+msgid "Mailbox Information"
+msgstr ""
+
+#. When asking for NS record in DNS context
+#: ../src/main.c:675
+msgid "Name Server"
+msgstr "Nomservilo"
+
+#: ../src/main.c:676
+msgid "Host name for Address"
+msgstr ""
+
+#: ../src/main.c:677
+msgid "Start-of-authority"
+msgstr ""
+
+#: ../src/main.c:678
+msgid "Text Information"
+msgstr ""
+
+#: ../src/main.c:679
+msgid "Well Known Services"
+msgstr ""
+
+#: ../src/main.c:680
+msgid "Any / All Information"
+msgstr "Iuj / Ä?iuj informoj"
+
+#: ../src/netstat.c:122
+msgid "Getting routing table"
+msgstr ""
+
+#: ../src/netstat.c:137
+msgid "Getting active Internet connections"
+msgstr ""
+
+#: ../src/netstat.c:146
+msgid "Getting group memberships"
+msgstr ""
+
+#: ../src/netstat.c:450
+msgid "IP Source"
+msgstr "IP-fonto"
+
+#: ../src/netstat.c:458
+msgid "Port/Service"
+msgstr "Pordo/Servo"
+
+#: ../src/netstat.c:466 ../src/scan.c:314
+msgid "State"
+msgstr "Stato"
+
+#: ../src/netstat.c:609
+msgid "Destination/Prefix"
+msgstr ""
+
+#: ../src/netstat.c:611
+msgid "Destination"
+msgstr "Celo"
+
+#: ../src/netstat.c:618
+msgid "Gateway"
+msgstr ""
+
+#: ../src/netstat.c:626
+msgid "Netmask"
+msgstr "Retmasko"
+
+#: ../src/netstat.c:634 ../src/netstat.c:741
+msgid "Interface"
+msgstr "Interfaco"
+
+#: ../src/netstat.c:748
+msgid "Member"
+msgstr "Membro"
+
+#: ../src/netstat.c:756
+msgid "Group"
+msgstr "Grupo"
+
+#. The netstat "Display active network services" output in
+#. text format.
+#. It's a tabular output, and these belongs to the column titles
+#: ../src/netstat.c:798
+msgid "Protocol\tIP Source\tPort/Service\tState\n"
+msgstr ""
+
+#. The netstat "Display routing" output in text format.
+#. This seems as a route table.
+#. It's a tabular output, and these belongs to the column titles
+#: ../src/netstat.c:804
+msgid "Destination\tGateway\tNetmask\tInterface\n"
+msgstr ""
+
+#. The netstat "Multicast information" output in text format.
+#. It's a tabular output, and these belongs to the column titles
+#: ../src/netstat.c:809
+msgid "Interface\tMember\tGroup\n"
+msgstr ""
+
+#: ../src/nettool.c:199
+msgid "A network address was not specified"
+msgstr ""
+
+#: ../src/nettool.c:200 ../src/nettool.c:209
+msgid "Please enter a valid network address and try again."
+msgstr ""
+
+#: ../src/nettool.c:207
+#, c-format
+msgid "The address '%s' cannot be found"
+msgstr ""
+
+#: ../src/nettool.c:236
+msgid "A domain address was not specified"
+msgstr ""
+
+#: ../src/nettool.c:237
+msgid "Please enter a valid domain address and try again."
+msgstr ""
+
+#: ../src/nettool.c:428
+msgid "Information not available"
+msgstr "Informo ne estas disponebla"
+
+#: ../src/nettool.c:548
+msgid "Stop"
+msgstr "Halti"
+
+#: ../src/nettool.c:554
+msgid "Run"
+msgstr "Ruli"
+
+#. Created up here so we can get the geometry info.
+#: ../src/ping.c:151
+msgid "Time (ms):"
+msgstr "Tempo (ms):"
+
+#: ../src/ping.c:172
+msgid "Seq. No.:"
+msgstr ""
+
+#: ../src/ping.c:257
+#, c-format
+msgid "Sending ping requests to %s"
+msgstr ""
+
+#: ../src/ping.c:572
+msgid "Bytes"
+msgstr "Bajtoj"
+
+#: ../src/ping.c:579
+msgid "Source"
+msgstr "Fonto"
+
+#: ../src/ping.c:587
+msgid "Seq"
+msgstr ""
+
+#: ../src/ping.c:597
+msgid "Time"
+msgstr "Tempo"
+
+#: ../src/ping.c:605
+msgid "Units"
+msgstr "Unuoj"
+
+#. The ping output in text format:
+#. Bytes received, Address Source, Number of Sequence,
+#. Round Trip Time (Time), Units of Time.
+#. It's a tabular output, and these belongs to the column titles
+#: ../src/ping.c:631
+msgid "Bytes\tSource\tSeq\tTime\tUnits\n"
+msgstr ""
+
+#. The ping output in a text format (to copy on clipboard)
+#: ../src/ping.c:646
+#, c-format
+msgid "Time minimum:\t%s ms\n"
+msgstr ""
+
+#: ../src/ping.c:647
+#, c-format
+msgid "Time average:\t%s ms\n"
+msgstr ""
+
+#: ../src/ping.c:648
+#, c-format
+msgid "Time maximum:\t%s ms\n"
+msgstr ""
+
+#: ../src/ping.c:650
+#, c-format
+msgid "Packets transmitted:\t%s\n"
+msgstr ""
+
+#: ../src/ping.c:652
+#, c-format
+msgid "Packets received:\t%s\n"
+msgstr ""
+
+#: ../src/ping.c:655
+#, c-format
+msgid "Successful packets:\t%s\n"
+msgstr ""
+
+#: ../src/scan.c:94
+#, c-format
+msgid "Scanning %s for open ports"
+msgstr ""
+
+#: ../src/scan.c:169
+msgid "unknown"
+msgstr "nekonate"
+
+#. Translators: "open" is a network status and should be one word.
+#: ../src/scan.c:173
+msgid "open"
+msgstr "malferme"
+
+#: ../src/scan.c:306
+msgid "Port"
+msgstr "Pordo"
+
+#: ../src/scan.c:322
+msgid "Service"
+msgstr "Servo"
+
+#. The portscan output in text format:
+#. Port, State, Service.
+#. It's a tabular output, and these belongs to the column titles
+#: ../src/scan.c:344
+msgid "Port\tState\tService\n"
+msgstr "Pordo\tStato\tServo\n"
+
+#: ../src/traceroute.c:62
+#, c-format
+msgid "Tracing route to %s"
+msgstr ""
+
+#: ../src/traceroute.c:265
+msgid "Hop"
+msgstr ""
+
+#: ../src/traceroute.c:273
+msgid "Hostname"
+msgstr ""
+
+#: ../src/traceroute.c:281
+msgid "IP"
+msgstr "IP"
+
+#: ../src/traceroute.c:292
+msgid "Time 1"
+msgstr "Tempo 1"
+
+#: ../src/traceroute.c:302
+msgid "Time 2"
+msgstr "Tempo 2"
+
+#. The traceroute output in text format:
+#. Hop count, Hostname, IP, Round Trip Time 1 (Time1),
+#. Round Trip Time 2 (Time2),
+#. It's a tabular output, and these belongs to the column titles
+#: ../src/traceroute.c:328
+msgid "Hop\tHostname\tIP\tTime 1\tTime 2\n"
+msgstr ""
+
+#: ../src/utils.c:227
+#, c-format
+msgid ""
+"In order to use this feature of the program, %s must be installed in your "
+"system"
+msgstr ""
+
+#: ../src/finger.c:63
+#, c-format
+msgid "Getting information of %s on \"%s\""
+msgstr ""
+
+#: ../src/finger.c:67
+#, c-format
+msgid "Getting information of all users on \"%s\""
+msgstr ""
+
+#: ../src/whois.c:58
+#, c-format
+msgid "Getting the whois information of %s"
+msgstr ""
diff -pruN 3.0.0-2/po/fi.po 3.0.1-0ubuntu1/po/fi.po
--- 3.0.0-2/po/fi.po 2010-12-02 09:26:14.000000000 +0000
+++ 3.0.1-0ubuntu1/po/fi.po 2011-12-31 23:54:24.000000000 +0000
@@ -1,406 +1,445 @@
# gnome-nettool Finnish translation.
# Copyright (C) 2004-2009 Free Software Foundation, Inc.
# This file is distributed under the same license as the gnome-nettool package.
-# Tommi Vainikainen <Tommi Vainikainen iki fi>, 2004-2005, 2009.
+# Tommi Vainikainen <Tommi Vainikainen iki fi>, 2004-2005, 2009, 2011.
# Ilkka Tuohela <hile iki fi>, 2005-2009.
#
msgid ""
msgstr ""
"Project-Id-Version: gnome-nettool\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-14 15:16+0300\n"
-"PO-Revision-Date: 2009-08-14 15:17+0300\n"
+"POT-Creation-Date: 2011-06-07 10:02+0300\n"
+"PO-Revision-Date: 2011-06-07 10:05+0300\n"
"Last-Translator: Tommi Vainikainen <thv iki fi>\n"
"Language-Team: Finnish <gnome-fi-laatu lists sourceforge net>\n"
+"Language: fi\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"
-#: ../src/callbacks.c:323
+#: ../src/callbacks.c:332
msgid "translator-credits"
msgstr ""
-"Tommi Vainikainen, 2004-2005\n"
+"Tommi Vainikainen, 2004-2005, 2011\n"
"Ilkka Tuohela, 2005-2009\n"
"\n"
"http://gnome.fi/";
#. Translators: %s is the name of the copyright holder
-#: ../src/callbacks.c:330
+#: ../src/callbacks.c:339
#, c-format
msgid "Copyright © 2003-2008 %s"
msgstr "Tekijänoikeudet © 2003-2008 %s"
#. Dear translator: This is the name of the application
-#: ../src/callbacks.c:334 ../src/callbacks.c:335
-#: ../src/gnome-nettool.desktop.in.in.h:1
+#: ../src/callbacks.c:343 ../src/callbacks.c:344
+#: ../data/gnome-nettool.desktop.in.in.h:1
msgid "Network Tools"
msgstr "Verkkotyökalut"
-#: ../src/callbacks.c:337
+#: ../src/callbacks.c:346
msgid "Graphical user interface for common network utilities"
msgstr "Graafinen käyttöliittymä yleisille verkkotyökaluille"
-#: ../src/callbacks.c:450 ../src/main.c:142 ../src/nettool.c:483
+#: ../src/callbacks.c:458 ../src/main.c:142 ../src/nettool.c:483
msgid "Idle"
msgstr "Jouten"
#. Dear Translator: This is the Window Title. 'Network Tools' is the
#. * name of the application
-#: ../src/callbacks.c:455
+#: ../src/callbacks.c:463
#, c-format
msgid "%s - Network Tools"
msgstr "%s - verkkotyökalut"
-#: ../src/callbacks.c:479
+#: ../src/callbacks.c:487
msgid "Unable to open help file"
msgstr "Ohjetiedostoa ei voi avata"
-#: ../src/gnome-nettool.ui.h:1
+#: ../data/gnome-nettool.desktop.in.in.h:2
+msgid "View information about your network"
+msgstr "Näytä tietoja verkostasi"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:1
+msgid "A list of domains previously used"
+msgstr "Luettelo aiemmin käytetyistä toimialueista"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:2
+msgid "A list of hostnames previously used"
+msgstr "Luettelo aiemmin käytetyistä verkkonimistä"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:3
+msgid "A list of usernames previously used"
+msgstr "Luettelo aiemmin käytetyistä käyttäjätunnuksista"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:4
+msgid "Historically used domains"
+msgstr "Historiallisesti käytetyt toimialueet"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:5
+msgid "Historically used hostnames"
+msgstr "Historiallisesti käytetyt verkkonimet"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:6
+msgid "Historically used usernames"
+msgstr "Historiallisesti käytetyt käyttäjätunnukset"
+
+#: ../data/gnome-nettool.ui.h:1
msgid "0"
msgstr "0"
-#: ../src/gnome-nettool.ui.h:3
+#: ../data/gnome-nettool.ui.h:3
#, no-c-format
msgid "0%"
msgstr "0 %"
-#: ../src/gnome-nettool.ui.h:4
+#: ../data/gnome-nettool.ui.h:4
msgid "0.0"
msgstr "0.0"
-#: ../src/gnome-nettool.ui.h:5
+#: ../data/gnome-nettool.ui.h:5
msgid "<b>IP Information</b>"
msgstr "<b>IP-tiedot</b>"
-#: ../src/gnome-nettool.ui.h:6
+#: ../data/gnome-nettool.ui.h:6
msgid "<b>Interface Information</b>"
msgstr "<b>Liitännän tiedot</b>"
-#: ../src/gnome-nettool.ui.h:7
+#: ../data/gnome-nettool.ui.h:7
msgid "<b>Interface Statistics</b>"
msgstr "<b>Liitännän tilastot</b>"
-#: ../src/gnome-nettool.ui.h:8
+#: ../data/gnome-nettool.ui.h:8
msgid "<b>Round Trip Time Statistics</b>"
msgstr "<b>Edestakaisen ajan tilastot</b>"
-#: ../src/gnome-nettool.ui.h:9
+#: ../data/gnome-nettool.ui.h:9
msgid "<b>Transmission Statistics</b>"
msgstr "<b>Siirtotilastot</b>"
-#: ../src/gnome-nettool.ui.h:10
+#: ../data/gnome-nettool.ui.h:10
msgid "Active Network Services"
msgstr "Toimivat verkkopalvelut"
-#: ../src/gnome-nettool.ui.h:11
+#: ../data/gnome-nettool.ui.h:11
msgid "Average:"
msgstr "Keskiarvo:"
-#: ../src/gnome-nettool.ui.h:12
+#: ../data/gnome-nettool.ui.h:12
msgid "Beep on ping"
msgstr "Piippaa pingatessa"
-#: ../src/gnome-nettool.ui.h:13
+#: ../data/gnome-nettool.ui.h:13
msgid "Clear _History"
msgstr "Tyhjennä _historia"
-#: ../src/gnome-nettool.ui.h:14
+#: ../data/gnome-nettool.ui.h:14
msgid "Collisions:"
msgstr "Törmäykset:"
-#: ../src/gnome-nettool.ui.h:15
+#: ../data/gnome-nettool.ui.h:15
msgid "Copy as text _report"
msgstr "Kopioi teksti_raportiksi"
-#: ../src/gnome-nettool.ui.h:16
+#: ../data/gnome-nettool.ui.h:16
msgid "Details"
msgstr "Yksityiskohdat"
-#: ../src/gnome-nettool.ui.h:17
+#: ../data/gnome-nettool.ui.h:17
msgid "Devices"
msgstr "Laitteet"
-#: ../src/gnome-nettool.ui.h:18
+#: ../data/gnome-nettool.ui.h:18
msgid "Devices - Network Tools"
msgstr "Laitteet - Verkkotyökalut"
-#: ../src/gnome-nettool.ui.h:19
+#: ../data/gnome-nettool.ui.h:19
msgid "Display:"
msgstr "Näyttö:"
-#: ../src/gnome-nettool.ui.h:20
+#: ../data/gnome-nettool.ui.h:20
msgid "Domain address"
msgstr "Tomialueen osoite"
-#: ../src/gnome-nettool.ui.h:21
+#: ../data/gnome-nettool.ui.h:21
msgid ""
"Enter a domain address to lookup its whois information. For example: www."
"domain.com or 192.168.2.1"
-msgstr "Syötä toimialueosoite, jonka whois-tiedot selvitetään. Esimerkiksi: www.jotain.fi tai 192.168.2.1"
+msgstr ""
+"Syötä toimialueosoite, jonka whois-tiedot selvitetään. Esimerkiksi: www."
+"jotain.fi tai 192.168.2.1"
-#: ../src/gnome-nettool.ui.h:22
+#: ../data/gnome-nettool.ui.h:22
msgid ""
"Enter the network address to finger that user. For example: www.domain.com "
"or 192.168.2.1"
-msgstr "Syötä verkko-osoite, josta käyttäjää fingeröidään. Esimerkiksi: www.jotain.fi tai 192.168.2.1"
+msgstr ""
+"Syötä verkko-osoite, josta käyttäjää fingeröidään. Esimerkiksi: www.jotain."
+"fi tai 192.168.2.1"
-#: ../src/gnome-nettool.ui.h:23
+#: ../data/gnome-nettool.ui.h:23
msgid ""
"Enter the network address to lookup. For example: www.domain.com or "
"192.168.2.1"
-msgstr "Syötä selvitettävä verkko-osoite. Esimerkiksi: www.jotain.fi tai 192.168.2.1"
+msgstr ""
+"Syötä selvitettävä verkko-osoite. Esimerkiksi: www.jotain.fi tai 192.168.2.1"
-#: ../src/gnome-nettool.ui.h:24
+#: ../data/gnome-nettool.ui.h:24
msgid ""
"Enter the network address to ping. For example: www.domain.com or 192.168.2.1"
-msgstr "Syötä pingattava verkko-osoite. Esimerkiksi: www.jotain.fi tai 192.168.2.1"
+msgstr ""
+"Syötä pingattava verkko-osoite. Esimerkiksi: www.jotain.fi tai 192.168.2.1"
-#: ../src/gnome-nettool.ui.h:25
+#: ../data/gnome-nettool.ui.h:25
msgid ""
"Enter the network address to scan for open ports. For example: www.domain."
"com or 192.168.2.1"
-msgstr "Syötä verkko-osoite, jonka avoimet portit skannataan. Esimerkiksi: www.jotain.fi tai 192.168.2.1"
+msgstr ""
+"Syötä verkko-osoite, jonka avoimet portit skannataan. Esimerkiksi: www."
+"jotain.fi tai 192.168.2.1"
-#: ../src/gnome-nettool.ui.h:26
+#: ../data/gnome-nettool.ui.h:26
msgid ""
"Enter the network address to trace a route to. For example: www.domain.com "
"or 192.168.2.1"
-msgstr "Syötä verkko-osoite, jonne reitti jäljitetään. Esimerkiksi: www.jotain.fi tai 192.168.2.1"
+msgstr ""
+"Syötä verkko-osoite, jonne reitti jäljitetään. Esimerkiksi: www.jotain.fi "
+"tai 192.168.2.1"
-#: ../src/gnome-nettool.ui.h:27
+#: ../data/gnome-nettool.ui.h:27
msgid "Enter the user to finger"
msgstr "Syötä fingeröitävä käyttäjä"
-#: ../src/gnome-nettool.ui.h:28 ../src/main.c:814
+#: ../data/gnome-nettool.ui.h:28 ../src/main.c:812
msgid "Finger"
msgstr "Finger"
-#: ../src/gnome-nettool.ui.h:29
+#: ../data/gnome-nettool.ui.h:29
msgid "Finger output"
msgstr "Finger-tuloste"
-#: ../src/gnome-nettool.ui.h:30
+#: ../data/gnome-nettool.ui.h:30
msgid "Hardware address:"
msgstr "Laiteosoite:"
-#: ../src/gnome-nettool.ui.h:31
+#: ../data/gnome-nettool.ui.h:31
msgid "Host"
msgstr "Verkkonimi"
-#: ../src/gnome-nettool.ui.h:32
+#: ../data/gnome-nettool.ui.h:32
msgid "Link speed:"
msgstr "Yhteysnopeus:"
-#: ../src/gnome-nettool.ui.h:33 ../src/main.c:734
+#: ../data/gnome-nettool.ui.h:33 ../src/main.c:732
msgid "Lookup"
msgstr "Nimen haku"
-#: ../src/gnome-nettool.ui.h:34
+#: ../data/gnome-nettool.ui.h:34
msgid "Lookup output"
msgstr "Haun tuloste"
-#: ../src/gnome-nettool.ui.h:35
+#: ../data/gnome-nettool.ui.h:35
msgid "MTU:"
msgstr "MTU:"
-#: ../src/gnome-nettool.ui.h:36
+#: ../data/gnome-nettool.ui.h:36
msgid "Maximum:"
msgstr "Maksimi:"
-#: ../src/gnome-nettool.ui.h:37
+#: ../data/gnome-nettool.ui.h:37
msgid "Minimum:"
msgstr "Minimi:"
-#: ../src/gnome-nettool.ui.h:38
+#: ../data/gnome-nettool.ui.h:38
msgid "Multicast Information"
msgstr "Monilähetystiedot"
-#: ../src/gnome-nettool.ui.h:39
+#: ../data/gnome-nettool.ui.h:39
msgid "Multicast:"
msgstr "Monilähetys:"
-#: ../src/gnome-nettool.ui.h:40 ../src/main.c:446
+#: ../data/gnome-nettool.ui.h:40 ../src/main.c:446
msgid "Netstat"
msgstr "Verkkotilastot"
-#: ../src/gnome-nettool.ui.h:41
+#: ../data/gnome-nettool.ui.h:41
msgid "Netstat output"
msgstr "Netstat-tuloste"
-#: ../src/gnome-nettool.ui.h:42
+#: ../data/gnome-nettool.ui.h:42
msgid "Network address"
msgstr "Verkko-osoite"
-#: ../src/gnome-nettool.ui.h:43
+#: ../data/gnome-nettool.ui.h:43
msgid "Not Available"
msgstr "Ei käytettävissä"
-#: ../src/gnome-nettool.ui.h:44
+#: ../data/gnome-nettool.ui.h:44
msgid "Only"
msgstr "Vain"
-#: ../src/gnome-nettool.ui.h:45
+#: ../data/gnome-nettool.ui.h:45
msgid "Output for finger"
msgstr "Finger-komennon tuloste"
-#: ../src/gnome-nettool.ui.h:46
+#: ../data/gnome-nettool.ui.h:46
msgid "Output for lookup"
msgstr "Hakukomennon tuloste"
-#: ../src/gnome-nettool.ui.h:47
+#: ../data/gnome-nettool.ui.h:47
msgid "Output for net stat"
msgstr "Netstat-komennon tuloste"
-#: ../src/gnome-nettool.ui.h:48
+#: ../data/gnome-nettool.ui.h:48
msgid "Output for port scan"
msgstr "Porttiskannauksen tuloste"
-#: ../src/gnome-nettool.ui.h:49
+#: ../data/gnome-nettool.ui.h:49
msgid "Output for traceroute"
msgstr "Traceroute-komennon tuloste"
-#: ../src/gnome-nettool.ui.h:50
+#: ../data/gnome-nettool.ui.h:50
msgid "Output for whois"
msgstr "Whois-komennon tuloste"
-#: ../src/gnome-nettool.ui.h:51
+#: ../data/gnome-nettool.ui.h:51
msgid "Packets received:"
msgstr "Paketteja vastaanotettu:"
-#: ../src/gnome-nettool.ui.h:52
+#: ../data/gnome-nettool.ui.h:52
msgid "Packets transmitted:"
msgstr "Paketteja lähetetty:"
-#: ../src/gnome-nettool.ui.h:53 ../src/main.c:290
+#: ../data/gnome-nettool.ui.h:53 ../src/main.c:290
msgid "Ping"
msgstr "Ping"
-#: ../src/gnome-nettool.ui.h:54
+#: ../data/gnome-nettool.ui.h:54
msgid "Port Scan"
msgstr "Porttiskannaus"
-#: ../src/gnome-nettool.ui.h:55
+#: ../data/gnome-nettool.ui.h:55
msgid "Port scan output"
msgstr "Porttiskannauksen tuloste"
-#: ../src/gnome-nettool.ui.h:56
+#: ../data/gnome-nettool.ui.h:56
msgid "Received bytes:"
msgstr "Vastaanotetut tavut:"
-#: ../src/gnome-nettool.ui.h:57
+#: ../data/gnome-nettool.ui.h:57
msgid "Received packets:"
msgstr "Vastaanotetut paketit:"
-#: ../src/gnome-nettool.ui.h:58
+#: ../data/gnome-nettool.ui.h:58
msgid "Reception errors:"
msgstr "Vastaanottovirheet:"
-#: ../src/gnome-nettool.ui.h:59
+#: ../data/gnome-nettool.ui.h:59
msgid "Routing Table Information"
msgstr "Reititystaulun tiedot"
-#: ../src/gnome-nettool.ui.h:60 ../src/main.c:619
+#: ../data/gnome-nettool.ui.h:60 ../src/main.c:617
msgid "Scan"
msgstr "Skannaa"
-#: ../src/gnome-nettool.ui.h:61
+#: ../data/gnome-nettool.ui.h:61
msgid "Send:"
msgstr "Lähetä:"
-#: ../src/gnome-nettool.ui.h:62
+#: ../data/gnome-nettool.ui.h:62
msgid "State:"
msgstr "Tila:"
-#: ../src/gnome-nettool.ui.h:63
+#: ../data/gnome-nettool.ui.h:63
msgid "Successful packets:"
msgstr "Onnistuneet paketit:"
-#: ../src/gnome-nettool.ui.h:64 ../src/main.c:375
+#: ../data/gnome-nettool.ui.h:64 ../src/main.c:375
msgid "Trace"
msgstr "Jäljitä"
-#: ../src/gnome-nettool.ui.h:65
+#: ../data/gnome-nettool.ui.h:65
msgid "Traceroute"
msgstr "Reitinjäljitys"
-#: ../src/gnome-nettool.ui.h:66
+#: ../data/gnome-nettool.ui.h:66
msgid "Traceroute output"
msgstr "Traceroute-tuloste"
-#: ../src/gnome-nettool.ui.h:67
+#: ../data/gnome-nettool.ui.h:67
msgid "Transmission errors:"
msgstr "Lähetysvirheitä:"
-#: ../src/gnome-nettool.ui.h:68
+#: ../data/gnome-nettool.ui.h:68
msgid "Transmitted bytes:"
msgstr "Lähetettyjä tavuja:"
-#: ../src/gnome-nettool.ui.h:69
+#: ../data/gnome-nettool.ui.h:69
msgid "Transmitted packets:"
msgstr "Lähetettyjä paketteja:"
-#: ../src/gnome-nettool.ui.h:70
+#: ../data/gnome-nettool.ui.h:70
msgid "Unlimited requests"
msgstr "Rajattomasti pyyntöjä"
-#: ../src/gnome-nettool.ui.h:71
+#: ../data/gnome-nettool.ui.h:71
msgid "User"
msgstr "Käyttäjä"
-#: ../src/gnome-nettool.ui.h:72
+#: ../data/gnome-nettool.ui.h:72
msgid "User name"
msgstr "Käyttäjätunnus"
-#: ../src/gnome-nettool.ui.h:73 ../src/main.c:920
+#: ../data/gnome-nettool.ui.h:73 ../src/main.c:918
msgid "Whois"
msgstr "Whois"
-#: ../src/gnome-nettool.ui.h:74
+#: ../data/gnome-nettool.ui.h:74
msgid "Whois output"
msgstr "Whois-tuloste"
-#: ../src/gnome-nettool.ui.h:75
+#: ../data/gnome-nettool.ui.h:75
msgid "_Configure"
msgstr "_Asetukset"
-#: ../src/gnome-nettool.ui.h:76
+#: ../data/gnome-nettool.ui.h:76
msgid "_Domain address:"
msgstr "_Toimialueosoite:"
-#: ../src/gnome-nettool.ui.h:77
+#: ../data/gnome-nettool.ui.h:77
msgid "_Edit"
msgstr "_Muokkaa"
-#: ../src/gnome-nettool.ui.h:78
+#: ../data/gnome-nettool.ui.h:78
msgid "_Help"
msgstr "O_hje"
-#: ../src/gnome-nettool.ui.h:79
+#: ../data/gnome-nettool.ui.h:79
msgid "_Information type:"
msgstr "_Tietojen tyyppi:"
-#: ../src/gnome-nettool.ui.h:80
+#: ../data/gnome-nettool.ui.h:80
msgid "_Network address:"
msgstr "_Verkko-osoite:"
-#: ../src/gnome-nettool.ui.h:81
+#: ../data/gnome-nettool.ui.h:81
msgid "_Network device:"
msgstr "_Verkkolaite:"
-#: ../src/gnome-nettool.ui.h:82
+#: ../data/gnome-nettool.ui.h:82
msgid "_Tool"
msgstr "_Työkalu"
-#: ../src/gnome-nettool.ui.h:83
+#: ../data/gnome-nettool.ui.h:83
msgid "_Username:"
msgstr "Käyttäjät_unnus:"
-#: ../src/gnome-nettool.ui.h:84
+#: ../data/gnome-nettool.ui.h:84
msgid "ms"
msgstr "ms"
-#: ../src/gnome-nettool.ui.h:85
+#: ../data/gnome-nettool.ui.h:85
msgid "requests"
msgstr "pyyntöä"
@@ -441,82 +480,82 @@ msgstr "Tuntematon liitäntä"
msgid "Network Devices Not Found"
msgstr "Verkkolaitteita ei löytynyt"
-#: ../src/info.c:392 ../src/info.c:395
+#: ../src/info.c:400 ../src/info.c:403
msgid "Unknown"
msgstr "Tuntematon"
-#: ../src/info.c:466
+#: ../src/info.c:474
msgid "Active"
msgstr "Toiminnassa"
-#: ../src/info.c:468
+#: ../src/info.c:476
msgid "Inactive"
msgstr "Ei käytössä"
-#: ../src/info.c:473
+#: ../src/info.c:481
msgid "Loopback"
msgstr "Silmukka"
-#: ../src/info.c:482
+#: ../src/info.c:490
msgid "Enabled"
msgstr "Käytössä"
-#: ../src/info.c:484
+#: ../src/info.c:492
msgid "Disabled"
msgstr "Ei käytössä"
#. The info output in a text format (to copy on clipboard)
-#: ../src/info.c:573
+#: ../src/info.c:581
#, c-format
msgid "Network device:\t%s\n"
msgstr "Verkkolaite:\t%s\n"
-#: ../src/info.c:574
+#: ../src/info.c:582
#, c-format
msgid "Hardware address:\t%s\n"
msgstr "Laiteosoite:\t%s\n"
-#: ../src/info.c:575
+#: ../src/info.c:583
#, c-format
msgid "Multicast:\t%s\n"
msgstr "Monilähetys:\t%s\n"
-#: ../src/info.c:576
+#: ../src/info.c:584
#, c-format
msgid "MTU:\t%s\n"
msgstr "MTU:\t%s\n"
-#: ../src/info.c:577
+#: ../src/info.c:585
#, c-format
msgid "Link speed:\t%s\n"
msgstr "Yhteysnopeus:\t%s\n"
-#: ../src/info.c:578
+#: ../src/info.c:586
#, c-format
msgid "State:\t%s\n"
msgstr "Tila:\t%s\n"
-#: ../src/info.c:580
+#: ../src/info.c:588
#, c-format
msgid "Transmitted packets:\t%s\n"
msgstr "Lähetettyjä paketteja:\t%s\n"
-#: ../src/info.c:581
+#: ../src/info.c:589
#, c-format
msgid "Transmission errors:\t%s\n"
msgstr "Lähetysvirheitä:\t%s\n"
-#: ../src/info.c:582
+#: ../src/info.c:590
#, c-format
msgid "Received packets:\t%s\n"
msgstr "Vastaanotetut paketit:\t%s\n"
-#: ../src/info.c:583
+#: ../src/info.c:591
#, c-format
msgid "Reception errors:\t%s\n"
msgstr "Vastaanottovirheet:\t%s\n"
-#: ../src/info.c:584
+#: ../src/info.c:592
#, c-format
msgid "Collisions:\t%s\n"
msgstr "Törmäykset:\t%s\n"
@@ -644,53 +683,53 @@ msgstr "Yleislähetys"
msgid "Scope"
msgstr "Laajuus"
-#: ../src/main.c:669
+#: ../src/main.c:667
msgid "Default Information"
msgstr "Oletustiedot"
-#: ../src/main.c:670
+#: ../src/main.c:668
msgid "Internet Address"
msgstr "Internet-osoite"
-#: ../src/main.c:671
+#: ../src/main.c:669
msgid "Canonical Name"
msgstr "Kanoninen nimi"
-#: ../src/main.c:672
+#: ../src/main.c:670
msgid "CPU / OS Type"
msgstr "Prosessori- ja käyttöjärjestelmätiedot"
#. When asking for MX record in DNS context
-#: ../src/main.c:674
+#: ../src/main.c:672
msgid "Mailbox Exchange"
msgstr "Sähköposti välitys"
-#: ../src/main.c:675
+#: ../src/main.c:673
msgid "Mailbox Information"
msgstr "Tietoja sähköpostin välityksestä"
#. When asking for NS record in DNS context
-#: ../src/main.c:677
+#: ../src/main.c:675
msgid "Name Server"
msgstr "Nimipalvelin"
-#: ../src/main.c:678
+#: ../src/main.c:676
msgid "Host name for Address"
msgstr "Osoitteen verkkonimi"
-#: ../src/main.c:679
+#: ../src/main.c:677
msgid "Start-of-authority"
msgstr "SOA-tietue"
-#: ../src/main.c:680
+#: ../src/main.c:678
msgid "Text Information"
msgstr "Tekstitiedot"
-#: ../src/main.c:681
+#: ../src/main.c:679
msgid "Well Known Services"
msgstr "Tunnetut palvelut"
-#: ../src/main.c:682
+#: ../src/main.c:680
msgid "Any / All Information"
msgstr "Mitkä tahansa / kaikki tiedot"
@@ -804,32 +843,32 @@ msgstr "Suorita"
msgid "Time (ms):"
msgstr "Aika (ms):"
-#: ../src/ping.c:171
+#: ../src/ping.c:172
msgid "Seq. No.:"
msgstr "Sekv.nr.:"
-#: ../src/ping.c:254
+#: ../src/ping.c:257
#, c-format
msgid "Sending ping requests to %s"
msgstr "Lähetetään tiedustelupaketteja isännälle %s"
-#: ../src/ping.c:569
+#: ../src/ping.c:572
msgid "Bytes"
msgstr "tavua"
-#: ../src/ping.c:576
+#: ../src/ping.c:579
msgid "Source"
msgstr "Lähde"
-#: ../src/ping.c:584
+#: ../src/ping.c:587
msgid "Seq"
msgstr "Sarja"
-#: ../src/ping.c:594
+#: ../src/ping.c:597
msgid "Time"
msgstr "Aika"
-#: ../src/ping.c:602
+#: ../src/ping.c:605
msgid "Units"
msgstr "Yksiköt"
@@ -837,37 +876,37 @@ msgstr "Yksiköt"
#. Bytes received, Address Source, Number of Sequence,
#. Round Trip Time (Time), Units of Time.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/ping.c:628
+#: ../src/ping.c:631
msgid "Bytes\tSource\tSeq\tTime\tUnits\n"
msgstr "Tavua\tLähde\tSarja\tAika\tYksikkö\n"
#. The ping output in a text format (to copy on clipboard)
-#: ../src/ping.c:643
+#: ../src/ping.c:646
#, c-format
msgid "Time minimum:\t%s ms\n"
msgstr "Lyhin aika:\t%s ms\n"
-#: ../src/ping.c:644
+#: ../src/ping.c:647
#, c-format
msgid "Time average:\t%s ms\n"
msgstr "Keskiarvoaika:\t%s ms\n"
-#: ../src/ping.c:645
+#: ../src/ping.c:648
#, c-format
msgid "Time maximum:\t%s ms\n"
msgstr "Pisin aika:\t%s ms\n"
-#: ../src/ping.c:647
+#: ../src/ping.c:650
#, c-format
msgid "Packets transmitted:\t%s\n"
msgstr "Paketteja lähetetty:\t%s\n"
-#: ../src/ping.c:649
+#: ../src/ping.c:652
#, c-format
msgid "Packets received:\t%s\n"
msgstr "Paketteja vastaanotettu:\t%s\n"
-#: ../src/ping.c:652
+#: ../src/ping.c:655
#, c-format
msgid "Successful packets:\t%s\n"
msgstr "Onnistuneet paketit:\t%s\n"
@@ -942,10 +981,6 @@ msgid ""
msgstr ""
"%s täytyy olla asennettuna, jotta voit käyttää tätä ohjelman ominaisuutta."
-#: ../src/gnome-nettool.desktop.in.in.h:2
-msgid "View information about your network"
-msgstr "Näytä tietoja verkostasi"
-
#: ../src/finger.c:63
#, c-format
msgid "Getting information of %s on \"%s\""
diff -pruN 3.0.0-2/po/ja.po 3.0.1-0ubuntu1/po/ja.po
--- 3.0.0-2/po/ja.po 2011-04-04 08:21:10.000000000 +0000
+++ 3.0.1-0ubuntu1/po/ja.po 2011-12-31 23:54:24.000000000 +0000
@@ -11,9 +11,9 @@ msgstr ""
"Project-Id-Version: gnome-nettool master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
"nettool&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-04-03 03:14+0000\n"
-"PO-Revision-Date: 2011-04-03 14:03+0900\n"
-"Last-Translator: Takayoshi OKANO <kano na rim or jp>\n"
+"POT-Creation-Date: 2011-07-13 08:50+0000\n"
+"PO-Revision-Date: 2011-09-11 07:40+0900\n"
+"Last-Translator: Jiro Matsuzawa <jmatsuzawa src gnome org>\n"
"Language-Team: Japanese <gnome-translation gnome gr jp>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -45,10 +45,10 @@ msgstr "ã??ã??ã??ã?¯ã?¼ã?¯ã?»ã??ã?¼ã?«"
#: ../src/callbacks.c:346
msgid "Graphical user interface for common network utilities"
msgstr ""
-"ã??ã??ã??ã??ã?ªã??ã??ã??ã?¯ã?¼ã?¯ã?»ã?¦ã?¼ã??ã?£ã?ªã??ã?£ã?«å¯¾å¿?ã??ã??ã?°ã?©ã??ã?£ã?«ã?«ã?ªã?¤ã?³ã?¿ã??ã?§ã?¼ã?¹"
-"ã??æ??ä¾?ã??ã?¾ã??ã??"
+"ã??ã??ã??ã??ã?ªã??ã??ã??ã?¯ã?¼ã?¯ã?»ã?¦ã?¼ã??ã?£ã?ªã??ã?£ã?«å¯¾å¿?ã??ã??ã?°ã?©ã??ã?£ã?«ã?«ã?ªã?¤ã?³ã?¿ã?¼ã??ã?§ã?¼"
+"ã?¹ã??æ??ä¾?ã??ã?¾ã??ã??"
-#: ../src/callbacks.c:458 ../src/main.c:142 ../src/nettool.c:483
+#: ../src/callbacks.c:458 ../src/main.c:142 ../src/nettool.c:488
msgid "Idle"
msgstr "å¾?æ©?ä¸ã?§ã??"
@@ -77,7 +77,7 @@ msgstr "å??ã?«ä½¿ã??ã??ã??ã??ã?¹ã??å??ã?
#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:3
msgid "A list of usernames previously used"
-msgstr "å??ã?«ä½¿ã??ã??ã??ã?¦ã?¼ã?¶å??ã?®ä¸?覧"
+msgstr "å??ã?«ä½¿ã??ã??ã??ã?¦ã?¼ã?¶ã?¼å??ã?®ä¸?覧"
#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:4
msgid "Historically used domains"
@@ -89,7 +89,7 @@ msgstr "ã??ã?¤ã?¦ä½¿ã??ã??ã??ã??ã?¹ã??å?
#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:6
msgid "Historically used usernames"
-msgstr "ã??ã?¤ã?¦ä½¿ã??ã??ã??ã?¦ã?¼ã?¶å??"
+msgstr "ã??ã?¤ã?¦ä½¿ã??ã??ã??ã?¦ã?¼ã?¶ã?¼å??"
#: ../data/gnome-nettool.ui.h:1
msgid "0"
@@ -110,11 +110,11 @@ msgstr "<b>IP (ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã?»ã
#: ../data/gnome-nettool.ui.h:6
msgid "<b>Interface Information</b>"
-msgstr "<b>ã?¤ã?³ã?¿ã??ã?§ã?¼ã?¹ã?®æ??å ±</b>"
+msgstr "<b>ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¼ã?¹ã?®æ??å ±</b>"
#: ../data/gnome-nettool.ui.h:7
msgid "<b>Interface Statistics</b>"
-msgstr "<b>ã?¤ã?³ã?¿ã??ã?§ã?¼ã?¹ã?®çµ±è¨?æ??å ±</b>"
+msgstr "<b>ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¼ã?¹ã?®çµ±è¨?æ??å ±</b>"
#: ../data/gnome-nettool.ui.h:8
msgid "<b>Round Trip Time Statistics</b>"
@@ -181,8 +181,8 @@ msgid ""
"Enter the network address to finger that user. For example: www.domain.com "
"or 192.168.2.1"
msgstr ""
-"ã?¦ã?¼ã?¶ã?? finger ã??ã??ã??ã??ã?®ã??ã??ã??ã?¯ã?¼ã?¯ã?¢ã??ã?¬ã?¹ã??å?¥å??ã??ã?¦ã??ã? ã??ã??ã??ä¾?ã??ã?° www."
-"domain.comã??ã??ã??ã??ã?¯ 192.168.2.1 ã?ªã?©ã?§ã??"
+"ã?¦ã?¼ã?¶ã?¼ã?? finger ã??ã??ã??ã??ã?®ã??ã??ã??ã?¯ã?¼ã?¯ã?¢ã??ã?¬ã?¹ã??å?¥å??ã??ã?¦ã??ã? ã??ã??ã??ä¾?ã??ã?° "
+"www.domain.comã??ã??ã??ã??ã?¯ 192.168.2.1 ã?ªã?©ã?§ã??"
#: ../data/gnome-nettool.ui.h:23
msgid ""
@@ -217,7 +217,7 @@ msgstr ""
#: ../data/gnome-nettool.ui.h:27
msgid "Enter the user to finger"
-msgstr "finger ã??ã??ã?¦ã?¼ã?¶ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
+msgstr "finger ã??ã??ã?¦ã?¼ã?¶ã?¼ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
#: ../data/gnome-nettool.ui.h:28 ../src/main.c:812
msgid "Finger"
@@ -393,11 +393,11 @@ msgstr "å?¶é??ã??ã?ªã??"
#: ../data/gnome-nettool.ui.h:71
msgid "User"
-msgstr "���"
+msgstr "����"
#: ../data/gnome-nettool.ui.h:72
msgid "User name"
-msgstr "ã?¦ã?¼ã?¶å??"
+msgstr "ã?¦ã?¼ã?¶ã?¼å??"
#: ../data/gnome-nettool.ui.h:73 ../src/main.c:918
msgid "Whois"
@@ -441,7 +441,7 @@ msgstr "ã??ã?¼ã?«(_T)"
#: ../data/gnome-nettool.ui.h:83
msgid "_Username:"
-msgstr "ã?¦ã?¼ã?¶å??(_U):"
+msgstr "ã?¦ã?¼ã?¶ã?¼å??(_U):"
#: ../data/gnome-nettool.ui.h:84
msgid "ms"
@@ -458,31 +458,31 @@ msgstr "ã??ã?®ä»?ã?®ç¨®é¡?"
#: ../src/info.c:61
msgid "Ethernet Interface"
-msgstr "Ethernet ã?¤ã?³ã?¿ã??ã?§ã?¼ã?¹"
+msgstr "Ethernet ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¼ã?¹"
#: ../src/info.c:62
msgid "Wireless Interface"
-msgstr "ç?¡ç·?ã?¤ã?³ã?¿ã??ã?§ã?¼ã?¹"
+msgstr "ç?¡ç·?ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¼ã?¹"
#: ../src/info.c:63
msgid "Modem Interface"
-msgstr "ã?¢ã??ã? ã?»ã?¤ã?³ã?¿ã??ã?§ã?¼ã?¹"
+msgstr "ã?¢ã??ã? ã?»ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¼ã?¹"
#: ../src/info.c:64
msgid "Parallel Line Interface"
-msgstr "ã??ã?©ã?¬ã?«ã?»ã?©ã?¤ã?³ã?»ã?¤ã?³ã?¿ã??ã?§ã?¼ã?¹"
+msgstr "ã??ã?©ã?¬ã?«ã?»ã?©ã?¤ã?³ã?»ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¼ã?¹"
#: ../src/info.c:65
msgid "Infrared Interface"
-msgstr "赤å¤?ç·?ã?¤ã?³ã?¿ã??ã?§ã?¼ã?¹"
+msgstr "赤å¤?ç·?ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¼ã?¹"
#: ../src/info.c:66
msgid "Loopback Interface"
-msgstr "ã?«ã?¼ã??ã??ã??ã?¯ã?»ã?¤ã?³ã?¿ã??ã?§ã?¼ã?¹"
+msgstr "ã?«ã?¼ã??ã??ã??ã?¯ã?»ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¼ã?¹"
#: ../src/info.c:67
msgid "Unknown Interface"
-msgstr "ä¸?æ??ã?ªã?¤ã?³ã?¿ã??ã?§ã?¼ã?¹"
+msgstr "ä¸?æ??ã?ªã?¤ã?³ã?¿ã?¼ã??ã?§ã?¼ã?¹"
#: ../src/info.c:165
msgid "Network Devices Not Found"
@@ -568,33 +568,33 @@ msgstr "å??ä¿¡ã?¨ã?©ã?¼æ?°:\t%s\n"
msgid "Collisions:\t%s\n"
msgstr "è¡?çª?ã??ã??å??æ?°:\t%s\n"
-#: ../src/info.h:27
+#: ../src/info.h:24
msgid "not available"
msgstr "����"
-#: ../src/lookup.c:80
+#: ../src/lookup.c:85
#, c-format
msgid "Looking up %s"
msgstr "%s ã?®å??ã??å??ã??ã??ä¸..."
-#: ../src/lookup.c:274
+#: ../src/lookup.c:279
msgid "Name"
msgstr "å??å??"
#. Time To Live of a hostname in a name server
-#: ../src/lookup.c:283
+#: ../src/lookup.c:288
msgid "TTL"
msgstr "TTL"
-#: ../src/lookup.c:292
+#: ../src/lookup.c:297
msgid "Address Type"
msgstr "ã?¢ã??ã?¬ã?¹ã?®ç¨®é¡?"
-#: ../src/lookup.c:302
+#: ../src/lookup.c:307
msgid "Record Type"
msgstr "å??ã??å??ã??ã??ã?®ç¨®é¡?"
-#: ../src/lookup.c:311
+#: ../src/lookup.c:316
msgid "Address"
msgstr "ã?¢ã??ã?¬ã?¹"
@@ -604,7 +604,7 @@ msgstr "ã?¢ã??ã?¬ã?¹"
#. Record Type (A, PTR, HINFO, NS, TXT, etc.),
#. Resolution (results of the query)
#. It's a tabular output, and these belongs to the column titles
-#: ../src/lookup.c:339
+#: ../src/lookup.c:344
msgid "Source\tTTL\tAddress Type\tRecord Type1\tResolution\n"
msgstr "ã?½ã?¼ã?¹\tTTL\tã?¢ã??ã?¬ã?¹ 種é¡?\tå??ã??å??ã??ã??ã?®ç¨®é¡?1\tã?¢ã??ã?¬ã?¹è§£æ±º\n"
@@ -647,7 +647,7 @@ msgstr "ã??ã??ã??ã?¯ã?¼ã?¯ã?»ã?¢ã??ã?¬ã?
#: ../src/main.c:106
msgid "Finger command to run"
-msgstr "æ??å®?ã??ã??ã?¦ã?¼ã?¶ã?«å¯¾ã??ã?¦ Finger ã??å®?è¡?ã??ã??"
+msgstr "æ??å®?ã??ã??ã?¦ã?¼ã?¶ã?¼ã?«å¯¾ã??ã?¦ Finger ã??å®?è¡?ã??ã??"
#: ../src/main.c:107
msgid "USER"
@@ -670,7 +670,7 @@ msgstr ""
"ã??ã?¡ã?¤ã?« %s ã??å?å?¨ã??ã?¾ã??ã??ã??`gnome-nettool` ã??æ£ã??ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã??ã?¦ã??ã??ã??"
"確èª?ã??ã?¦ã??ã? ã??ã??ã??"
-#: ../src/main.c:482 ../src/netstat.c:443
+#: ../src/main.c:482 ../src/netstat.c:455
msgid "Protocol"
msgstr "ã??ã?ã??ã?³ã?«"
@@ -718,7 +718,7 @@ msgstr "ã?¡ã?¼ã?«å??ä¿¡ç®±ã?®æ??å ± (MIN
#. When asking for NS record in DNS context
#: ../src/main.c:675
msgid "Name Server"
-msgstr "ã??ã?¼ã? ã?»ã?µã?¼ã?? (NS)"
+msgstr "ã??ã?¼ã? ã?»ã?µã?¼ã??ã?¼ (NS)"
#: ../src/main.c:676
msgid "Host name for Address"
@@ -740,142 +740,142 @@ msgstr "æ?¢ç?¥ã?®ã?µã?¼ã??ã?¹ (WKS)"
msgid "Any / All Information"
msgstr "ä»»æ??/ã??ã?¹ã?¦ã?®æ??å ±"
-#: ../src/netstat.c:122
+#: ../src/netstat.c:134
msgid "Getting routing table"
msgstr "çµ?è·¯ã??ã?¼ã??ã?«ã?®å??å¾?ä¸..."
-#: ../src/netstat.c:137
+#: ../src/netstat.c:149
msgid "Getting active Internet connections"
msgstr "å?©ç?¨å?¯è?½ã?ªã?¤ã?³ã?¿ã?¼ã??ã??ã??æ?¥ç¶?æ??å ±ã?®å??å¾?ä¸..."
-#: ../src/netstat.c:146
+#: ../src/netstat.c:158
msgid "Getting group memberships"
-msgstr "ã?°ã?«ã?¼ã??ã?®ã?¡ã?³ã??ã?·ã??ã??æ??å ±ã?®å??å¾?ä¸..."
+msgstr "ã?°ã?«ã?¼ã??ã?®ã?¡ã?³ã??ã?¼ã?·ã??ã??æ??å ±ã?®å??å¾?ä¸..."
-#: ../src/netstat.c:450
+#: ../src/netstat.c:462
msgid "IP Source"
msgstr "IP-���"
-#: ../src/netstat.c:458
+#: ../src/netstat.c:470
msgid "Port/Service"
msgstr "ã??ã?¼ã??/ã?µã?¼ã??ã?¹"
-#: ../src/netstat.c:466 ../src/scan.c:314
+#: ../src/netstat.c:478 ../src/scan.c:318
msgid "State"
msgstr "ç?¶æ??"
-#: ../src/netstat.c:609
+#: ../src/netstat.c:632
msgid "Destination/Prefix"
msgstr "é??ä¿¡å??/ã??ã?¬ã??ã?£ã??ã?¯ã?¹"
-#: ../src/netstat.c:611
+#: ../src/netstat.c:634
msgid "Destination"
msgstr "é??ä¿¡å??"
-#: ../src/netstat.c:618
+#: ../src/netstat.c:641
msgid "Gateway"
msgstr "ã?²ã?¼ã??ã?¦ã?§ã?¤"
-#: ../src/netstat.c:626
+#: ../src/netstat.c:649
msgid "Netmask"
msgstr "ã??ã??ã??ã??ã?¹ã?¯"
-#: ../src/netstat.c:634 ../src/netstat.c:741
+#: ../src/netstat.c:657 ../src/netstat.c:764
msgid "Interface"
-msgstr "ã?¤ã?³ã?¿ã??ã?§ã?¼ã?¹"
+msgstr "ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¼ã?¹"
-#: ../src/netstat.c:748
+#: ../src/netstat.c:771
msgid "Member"
-msgstr "ã?¡ã?³ã??"
+msgstr "ã?¡ã?³ã??ã?¼"
-#: ../src/netstat.c:756
+#: ../src/netstat.c:779
msgid "Group"
msgstr "ã?°ã?«ã?¼ã??"
#. The netstat "Display active network services" output in
#. text format.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/netstat.c:798
+#: ../src/netstat.c:821
msgid "Protocol\tIP Source\tPort/Service\tState\n"
msgstr "ã??ã?ã??ã?³ã?«\tIP-ã?½ã?¼ã?¹\tã??ã?¼ã??/ã?µã?¼ã??ã?¹\tç?¶æ??\n"
#. The netstat "Display routing" output in text format.
#. This seems as a route table.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/netstat.c:804
+#: ../src/netstat.c:827
msgid "Destination\tGateway\tNetmask\tInterface\n"
-msgstr "é??ä¿¡å??\tã?²ã?¼ã??ã?¦ã?§ã?¤\tã??ã??ã??ã??ã?¹ã?¯\tã?¤ã?³ã?¿ã??ã?§ã?¼ã?¹\n"
+msgstr "é??ä¿¡å??\tã?²ã?¼ã??ã?¦ã?§ã?¤\tã??ã??ã??ã??ã?¹ã?¯\tã?¤ã?³ã?¿ã?¼ã??ã?§ã?¼ã?¹\n"
#. The netstat "Multicast information" output in text format.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/netstat.c:809
+#: ../src/netstat.c:832
msgid "Interface\tMember\tGroup\n"
-msgstr "ã?¤ã?³ã?¿ã??ã?§ã?¼ã?¹\tã?¡ã?³ã??\tã?°ã?«ã?¼ã??\n"
+msgstr "ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¼ã?¹\tã?¡ã?³ã??ã?¼\tã?°ã?«ã?¼ã??\n"
-#: ../src/nettool.c:199
+#: ../src/nettool.c:204
msgid "A network address was not specified"
msgstr "ã??ã??ã??ã?¯ã?¼ã?¯ã?»ã?¢ã??ã?¬ã?¹ã??æ??å®?ã??ã??ã?¦ã??ã?¾ã??ã??"
-#: ../src/nettool.c:200 ../src/nettool.c:209
+#: ../src/nettool.c:205 ../src/nettool.c:214
msgid "Please enter a valid network address and try again."
msgstr "æ£ã??ã??ã??ã??ã??ã?¯ã?¼ã?¯ã?»ã?¢ã??ã?¬ã?¹ã??å?¥å??ã??ã?¦ã??ã??ä¸?度å®?è¡?ã??ã?¦ã??ã? ã??ã??ã??"
-#: ../src/nettool.c:207
+#: ../src/nettool.c:212
#, c-format
msgid "The address '%s' cannot be found"
msgstr "ã?¢ã??ã?¬ã?¹ '%s' ã??è¦?ã?¤ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??"
-#: ../src/nettool.c:236
+#: ../src/nettool.c:241
msgid "A domain address was not specified"
msgstr "ã??ã?¡ã?¤ã?³ã?»ã?¢ã??ã?¬ã?¹ã??æ??å®?ã??ã??ã?¦ã??ã?¾ã??ã??"
-#: ../src/nettool.c:237
+#: ../src/nettool.c:242
msgid "Please enter a valid domain address and try again."
msgstr "æ£ã??ã??ã??ã?¡ã?¤ã?³ã?»ã?¢ã??ã?¬ã?¹ã??å?¥å??ã??ã?¦ã??ã??ä¸?度å®?è¡?ã??ã?¦ã??ã? ã??ã??ã??"
-#: ../src/nettool.c:428
+#: ../src/nettool.c:433
msgid "Information not available"
msgstr "æ??å ±ã??å?©ç?¨å?¯è?½ã?§ã?¯ã??ã??ã?¾ã??ã??"
-#: ../src/nettool.c:548
+#: ../src/nettool.c:553
msgid "Stop"
msgstr "å??æ¢"
-#: ../src/nettool.c:554
+#: ../src/nettool.c:559
msgid "Run"
msgstr "å®?è¡?"
#. Created up here so we can get the geometry info.
-#: ../src/ping.c:151
+#: ../src/ping.c:155
msgid "Time (ms):"
msgstr "æ??é?? (ã??ã?ªç§?):"
-#: ../src/ping.c:172
+#: ../src/ping.c:176
msgid "Seq. No.:"
msgstr "ICMP��:"
-#: ../src/ping.c:257
+#: ../src/ping.c:261
#, c-format
msgid "Sending ping requests to %s"
msgstr "Ping ã?? %s ã?¸é??ä¿¡ä¸..."
-#: ../src/ping.c:572
+#: ../src/ping.c:577
msgid "Bytes"
msgstr "ã??ã?¤ã??æ?°"
-#: ../src/ping.c:579
+#: ../src/ping.c:584
msgid "Source"
msgstr "è¦?æ±?å??"
-#: ../src/ping.c:587
+#: ../src/ping.c:592
msgid "Seq"
msgstr "ICMP��"
-#: ../src/ping.c:597
+#: ../src/ping.c:602
msgid "Time"
msgstr "å¾?復æ??é??"
-#: ../src/ping.c:605
+#: ../src/ping.c:610
msgid "Units"
msgstr "å??ä½?"
@@ -883,92 +883,92 @@ msgstr "å??ä½?"
#. Bytes received, Address Source, Number of Sequence,
#. Round Trip Time (Time), Units of Time.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/ping.c:631
+#: ../src/ping.c:636
msgid "Bytes\tSource\tSeq\tTime\tUnits\n"
msgstr "ã??ã?¤ã??æ?°\tIP-ã?½ã?¼ã?¹\tICMPç?ªå?·\tå¾?復æ??é??\tå??ä½?\n"
#. The ping output in a text format (to copy on clipboard)
-#: ../src/ping.c:646
+#: ../src/ping.c:651
#, c-format
msgid "Time minimum:\t%s ms\n"
msgstr "å¾?復æ??é??ã?®æ??å°?:\t%s ã??ã?ªç§?\n"
-#: ../src/ping.c:647
+#: ../src/ping.c:652
#, c-format
msgid "Time average:\t%s ms\n"
msgstr "å¾?復æ??é??ã?®å¹³å??:\t%s ã??ã?ªç§?\n"
-#: ../src/ping.c:648
+#: ../src/ping.c:653
#, c-format
msgid "Time maximum:\t%s ms\n"
msgstr "å¾?復æ??é??ã?®æ??大:\t%s ã??ã?ªç§?\n"
-#: ../src/ping.c:650
+#: ../src/ping.c:655
#, c-format
msgid "Packets transmitted:\t%s\n"
msgstr "é??ä¿¡ã??ã?±ã??ã??æ?°:\t%s\n"
-#: ../src/ping.c:652
+#: ../src/ping.c:657
#, c-format
msgid "Packets received:\t%s\n"
msgstr "å??ä¿¡ã??ã?±ã??ã??æ?°:\t%s\n"
-#: ../src/ping.c:655
+#: ../src/ping.c:660
#, c-format
msgid "Successful packets:\t%s\n"
msgstr "å?°é??ã??ã??ã??ã?±ã??ã??ã?®å?²å??:\t%s\n"
-#: ../src/scan.c:94
+#: ../src/scan.c:98
#, c-format
msgid "Scanning %s for open ports"
msgstr "%s ã?§é??ã??ã?¦ã??ã??ã??ã?¼ã??ã?®ã?¹ã?ã?£ã?³ä¸..."
-#: ../src/scan.c:169
+#: ../src/scan.c:173
msgid "unknown"
msgstr "ä¸?æ??"
#. Translators: "open" is a network status and should be one word.
-#: ../src/scan.c:173
+#: ../src/scan.c:177
msgid "open"
msgstr "ã?ªã?¼ã??ã?³"
-#: ../src/scan.c:306
+#: ../src/scan.c:310
msgid "Port"
msgstr "ã??ã?¼ã??ç?ªå?·"
-#: ../src/scan.c:322
+#: ../src/scan.c:326
msgid "Service"
msgstr "ã?µã?¼ã??ã?¹"
#. The portscan output in text format:
#. Port, State, Service.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/scan.c:344
+#: ../src/scan.c:348
msgid "Port\tState\tService\n"
msgstr "ã??ã?¼ã??ç?ªå?·\tç?¶æ??\tã?µã?¼ã??ã?¹\n"
-#: ../src/traceroute.c:62
+#: ../src/traceroute.c:66
#, c-format
msgid "Tracing route to %s"
msgstr "%s ã?«å¯¾ã??ã??çµ?è·¯æ??å ±ã?®è¿½è·¡ä¸..."
-#: ../src/traceroute.c:265
+#: ../src/traceroute.c:269
msgid "Hop"
msgstr "ã??ã??ã??"
-#: ../src/traceroute.c:273
+#: ../src/traceroute.c:277
msgid "Hostname"
msgstr "ã??ã?¹ã??å??"
-#: ../src/traceroute.c:281
+#: ../src/traceroute.c:285
msgid "IP"
msgstr "IP-���"
-#: ../src/traceroute.c:292
+#: ../src/traceroute.c:296
msgid "Time 1"
msgstr "æ??é??1"
-#: ../src/traceroute.c:302
+#: ../src/traceroute.c:306
msgid "Time 2"
msgstr "æ??é??2"
@@ -976,11 +976,11 @@ msgstr "æ??é??2"
#. Hop count, Hostname, IP, Round Trip Time 1 (Time1),
#. Round Trip Time 2 (Time2),
#. It's a tabular output, and these belongs to the column titles
-#: ../src/traceroute.c:328
+#: ../src/traceroute.c:332
msgid "Hop\tHostname\tIP\tTime 1\tTime 2\n"
msgstr "ã??ã??ã??\tã??ã?¹ã??å??\tIP-ã?½ã?¼ã?¹\tæ??é??1\tæ??é??2\n"
-#: ../src/utils.c:227
+#: ../src/utils.c:231
#, c-format
msgid ""
"In order to use this feature of the program, %s must be installed in your "
@@ -988,17 +988,17 @@ msgid ""
msgstr ""
"ã??ã?®æ©?è?½ã??å?©ç?¨ã??ã??ã??ã??ã?« %s ã??ã??使ã??ã?®ã?·ã?¹ã??ã? ã?«ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã?¦ã??ã? ã??ã??"
-#: ../src/finger.c:63
+#: ../src/finger.c:66
#, c-format
msgid "Getting information of %s on \"%s\""
-msgstr "\"%2$s\" ä¸?ã?®ã?¦ã?¼ã?¶ %1$s ã?®æ??å ±ã??å??å¾?ã??ã?¦ã??ã?¾ã??..."
+msgstr "\"%2$s\" ä¸?ã?®ã?¦ã?¼ã?¶ã?¼ %1$s ã?®æ??å ±ã??å??å¾?ã??ã?¦ã??ã?¾ã??..."
-#: ../src/finger.c:67
+#: ../src/finger.c:70
#, c-format
msgid "Getting information of all users on \"%s\""
-msgstr "\"%s\" ä¸?ã?®å?¨ã?¦ã?¼ã?¶ã?®æ??å ±ã??å??å¾?ã??ã?¦ã??ã?¾ã??..."
+msgstr "\"%s\" ä¸?ã?®å?¨ã?¦ã?¼ã?¶ã?¼ã?®æ??å ±ã??å??å¾?ã??ã?¦ã??ã?¾ã??..."
-#: ../src/whois.c:58
+#: ../src/whois.c:62
#, c-format
msgid "Getting the whois information of %s"
msgstr "%s ã?® WhoIs æ??å ±ã?®å??å¾?ä¸..."
diff -pruN 3.0.0-2/po/LINGUAS 3.0.1-0ubuntu1/po/LINGUAS
--- 3.0.0-2/po/LINGUAS 2010-12-02 09:26:14.000000000 +0000
+++ 3.0.1-0ubuntu1/po/LINGUAS 2011-12-31 23:54:24.000000000 +0000
@@ -5,6 +5,7 @@ ar
as
ast
az
+be
bg
bn
bn_IN
@@ -21,6 +22,7 @@ el
en_CA
en_GB
en@shaw
+eo
es
et
eu
diff -pruN 3.0.0-2/po/lt.po 3.0.1-0ubuntu1/po/lt.po
--- 3.0.0-2/po/lt.po 2010-12-02 09:26:14.000000000 +0000
+++ 3.0.1-0ubuntu1/po/lt.po 2011-12-31 23:54:24.000000000 +0000
@@ -10,17 +10,16 @@
msgid ""
msgstr ""
"Project-Id-Version: lt\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-15 02:10+0300\n"
-"PO-Revision-Date: 2009-09-15 02:10+0300\n"
-"Last-Translator: Gintautas Miliauskas <gintautas miliauskas lt>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-nettool&component=general\n";
+"POT-Creation-Date: 2010-11-10 22:40+0000\n"
+"PO-Revision-Date: 2011-09-24 01:34+0300\n"
+"Last-Translator: Aurimas Ä?ernius <aurisc4 gmail com>\n"
"Language-Team: Lithuanian <gnome-lt lists akl lt>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
-"100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: ../src/callbacks.c:323
msgid "translator-credits"
@@ -35,8 +34,9 @@ msgid "Copyright © 2003-2008 %s"
msgstr "AutorinÄ?s teisÄ?s © 2003-2008 %s"
#. Dear translator: This is the name of the application
-#: ../src/callbacks.c:334 ../src/callbacks.c:335
-#: ../src/gnome-nettool.desktop.in.in.h:1
+#: ../src/callbacks.c:334
+#: ../src/callbacks.c:335
+#: ../data/gnome-nettool.desktop.in.in.h:1
msgid "Network Tools"
msgstr "Tinklo įrankiai"
@@ -44,378 +44,392 @@ msgstr "Tinklo įrankiai"
msgid "Graphical user interface for common network utilities"
msgstr "GrafinÄ? naudotojo sÄ?saja paprastoms tinklo programoms"
-#: ../src/callbacks.c:450 ../src/main.c:142 ../src/nettool.c:483
+#: ../src/callbacks.c:449
+#: ../src/main.c:142
+#: ../src/nettool.c:483
msgid "Idle"
msgstr "Nedirba"
#. Dear Translator: This is the Window Title. 'Network Tools' is the
#. * name of the application
-#: ../src/callbacks.c:455
+#: ../src/callbacks.c:454
#, c-format
msgid "%s - Network Tools"
msgstr "%s - Tinklo įrankiai"
-#: ../src/callbacks.c:479
+#: ../src/callbacks.c:478
msgid "Unable to open help file"
msgstr "Nepavyko atverti žinyno failo"
-#: ../src/gnome-nettool.ui.h:1
+#: ../data/gnome-nettool.desktop.in.in.h:2
+msgid "View information about your network"
+msgstr "Rodyti informacijÄ? apie tinklÄ?"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:1
+msgid "A list of domains previously used"
+msgstr "AnksÄ?iau naudotų domenų sÄ?raÅ¡as"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:2
+msgid "A list of hostnames previously used"
+msgstr "AnksÄ?iau naudotų kompiuterių sÄ?raÅ¡as"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:3
+msgid "A list of usernames previously used"
+msgstr "AnksÄ?iau naudotų naudotojų vardų sÄ?raÅ¡as"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:4
+msgid "Historically used domains"
+msgstr "Istoriškai naudoti domenai"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:5
+msgid "Historically used hostnames"
+msgstr "Istoriškai naudoti kompiuteriai"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:6
+msgid "Historically used usernames"
+msgstr "Istoriškai naudoti naudotojų vardai"
+
+#: ../data/gnome-nettool.ui.h:1
msgid "0"
msgstr "0"
-#: ../src/gnome-nettool.ui.h:3
+#: ../data/gnome-nettool.ui.h:3
#, no-c-format
msgid "0%"
msgstr "0%"
-#: ../src/gnome-nettool.ui.h:4
+#: ../data/gnome-nettool.ui.h:4
msgid "0.0"
msgstr "0.0"
-#: ../src/gnome-nettool.ui.h:5
+#: ../data/gnome-nettool.ui.h:5
msgid "<b>IP Information</b>"
msgstr "<b>IP informacija</b>"
-#: ../src/gnome-nettool.ui.h:6
+#: ../data/gnome-nettool.ui.h:6
msgid "<b>Interface Information</b>"
msgstr "<b>Įrenginio informacija</b>"
-#: ../src/gnome-nettool.ui.h:7
+#: ../data/gnome-nettool.ui.h:7
msgid "<b>Interface Statistics</b>"
msgstr "<b>SÄ?sajos statistika</b>"
-#: ../src/gnome-nettool.ui.h:8
+#: ../data/gnome-nettool.ui.h:8
msgid "<b>Round Trip Time Statistics</b>"
msgstr "<b>Laikai</b>"
-#: ../src/gnome-nettool.ui.h:9
+#: ../data/gnome-nettool.ui.h:9
msgid "<b>Transmission Statistics</b>"
msgstr "<b>Persiuntimų statistika</b>"
-#: ../src/gnome-nettool.ui.h:10
+#: ../data/gnome-nettool.ui.h:10
msgid "Active Network Services"
msgstr "Aktyvios tinklo paslaugos"
-#: ../src/gnome-nettool.ui.h:11
+#: ../data/gnome-nettool.ui.h:11
msgid "Average:"
msgstr "Vidurkis:"
-#: ../src/gnome-nettool.ui.h:12
+#: ../data/gnome-nettool.ui.h:12
msgid "Beep on ping"
msgstr "Pyptelti gavus ping"
-#: ../src/gnome-nettool.ui.h:13
+#: ../data/gnome-nettool.ui.h:13
msgid "Clear _History"
msgstr "IÅ¡valyti _istorijÄ?"
-#: ../src/gnome-nettool.ui.h:14
+#: ../data/gnome-nettool.ui.h:14
msgid "Collisions:"
msgstr "Kolizijų:"
-#: ../src/gnome-nettool.ui.h:15
+#: ../data/gnome-nettool.ui.h:15
msgid "Copy as text _report"
msgstr "Kopijuoti kaip tekstinį _praneÅ¡imÄ?"
-#: ../src/gnome-nettool.ui.h:16
+#: ../data/gnome-nettool.ui.h:16
msgid "Details"
msgstr "DetalÄ?s"
-#: ../src/gnome-nettool.ui.h:17
+#: ../data/gnome-nettool.ui.h:17
msgid "Devices"
msgstr "Įrenginiai"
-#: ../src/gnome-nettool.ui.h:18
+#: ../data/gnome-nettool.ui.h:18
msgid "Devices - Network Tools"
msgstr "Įrenginiai - tinklo įrankiai"
-#: ../src/gnome-nettool.ui.h:19
+#: ../data/gnome-nettool.ui.h:19
msgid "Display:"
msgstr "Rodyti:"
-#: ../src/gnome-nettool.ui.h:20
+#: ../data/gnome-nettool.ui.h:20
msgid "Domain address"
msgstr "Domeno adresas"
-#: ../src/gnome-nettool.ui.h:21
-msgid ""
-"Enter a domain address to lookup its whois information. For example: www."
-"domain.com or 192.168.2.1"
-msgstr ""
-"Ä®veskite kompiuterio adresÄ?, kurio whois informacija norite gauti. Pvz.: www."
-"domenas.lt ar 192.168.2.1"
-
-#: ../src/gnome-nettool.ui.h:22
-msgid ""
-"Enter the network address to finger that user. For example: www.domain.com "
-"or 192.168.2.1"
-msgstr ""
-"Ä®veskite kompiuterio adresÄ?, kuriame ieÅ¡kote naudotojo duomenų. Pvz.: auth."
-"domenas.lt arba 192.168.2.1"
-
-#: ../src/gnome-nettool.ui.h:23
-msgid ""
-"Enter the network address to lookup. For example: www.domain.com or "
-"192.168.2.1"
-msgstr ""
-"Ä®veskite kompiuterio adresÄ?, kurio informacijÄ? norite gauti. Pvz.: www."
-"domenas.lt ar 192.168.0.1"
-
-#: ../src/gnome-nettool.ui.h:24
-msgid ""
-"Enter the network address to ping. For example: www.domain.com or 192.168.2.1"
-msgstr ""
-"Ä®veskite kompiuterio adresÄ?, kuriam norite siųsti ping užklausÄ?. Pvz.: www."
-"domenas.lt ar 192.168.0.1"
-
-#: ../src/gnome-nettool.ui.h:25
-msgid ""
-"Enter the network address to scan for open ports. For example: www.domain."
-"com or 192.168.2.1"
-msgstr ""
-"Ä®veskite tinklo adresÄ?, kurio atvirus prievadus norite rasti. Pvz.: www."
-"domenas.lt ar 192.168.0.1"
-
-#: ../src/gnome-nettool.ui.h:26
-msgid ""
-"Enter the network address to trace a route to. For example: www.domain.com "
-"or 192.168.2.1"
-msgstr ""
-"Ä®veskite tinklo adresÄ?, iki kurio seksite marÅ¡rutÄ?. Pvz.: www.domenas.lt ar "
-"192.168.2.1"
+#: ../data/gnome-nettool.ui.h:21
+msgid "Enter a domain address to lookup its whois information. For example: www.domain.com or 192.168.2.1"
+msgstr "Ä®veskite kompiuterio adresÄ?, kurio whois informacija norite gauti. Pvz.: www.domenas.lt ar 192.168.2.1"
+
+#: ../data/gnome-nettool.ui.h:22
+msgid "Enter the network address to finger that user. For example: www.domain.com or 192.168.2.1"
+msgstr "Ä®veskite kompiuterio adresÄ?, kuriame ieÅ¡kote naudotojo duomenų. Pvz.: auth.domenas.lt arba 192.168.2.1"
+
+#: ../data/gnome-nettool.ui.h:23
+msgid "Enter the network address to lookup. For example: www.domain.com or 192.168.2.1"
+msgstr "Ä®veskite kompiuterio adresÄ?, kurio informacijÄ? norite gauti. Pvz.: www.domenas.lt ar 192.168.0.1"
+
+#: ../data/gnome-nettool.ui.h:24
+msgid "Enter the network address to ping. For example: www.domain.com or 192.168.2.1"
+msgstr "Ä®veskite kompiuterio adresÄ?, kuriam norite siųsti ping užklausÄ?. Pvz.: www.domenas.lt ar 192.168.0.1"
+
+#: ../data/gnome-nettool.ui.h:25
+msgid "Enter the network address to scan for open ports. For example: www.domain.com or 192.168.2.1"
+msgstr "Ä®veskite tinklo adresÄ?, kurio atvirus prievadus norite rasti. Pvz.: www.domenas.lt ar 192.168.0.1"
+
+#: ../data/gnome-nettool.ui.h:26
+msgid "Enter the network address to trace a route to. For example: www.domain.com or 192.168.2.1"
+msgstr "Ä®veskite tinklo adresÄ?, iki kurio seksite marÅ¡rutÄ?. Pvz.: www.domenas.lt ar 192.168.2.1"
-#: ../src/gnome-nettool.ui.h:27
+#: ../data/gnome-nettool.ui.h:27
msgid "Enter the user to finger"
msgstr "Ä®veskite naudotojÄ?, kurio informacijÄ? tikrinti."
-#: ../src/gnome-nettool.ui.h:28 ../src/main.c:814
+#: ../data/gnome-nettool.ui.h:28
+#: ../src/main.c:814
msgid "Finger"
msgstr "Finger"
-#: ../src/gnome-nettool.ui.h:29
+#: ../data/gnome-nettool.ui.h:29
msgid "Finger output"
msgstr "Finger išvedimas"
-#: ../src/gnome-nettool.ui.h:30
+#: ../data/gnome-nettool.ui.h:30
msgid "Hardware address:"
msgstr "Aparatūrinis adresas:"
-#: ../src/gnome-nettool.ui.h:31
+#: ../data/gnome-nettool.ui.h:31
msgid "Host"
msgstr "Kompiuteris"
-#: ../src/gnome-nettool.ui.h:32
+#: ../data/gnome-nettool.ui.h:32
msgid "Link speed:"
msgstr "Greitis:"
-#: ../src/gnome-nettool.ui.h:33 ../src/main.c:734
+#: ../data/gnome-nettool.ui.h:33
+#: ../src/main.c:734
msgid "Lookup"
msgstr "Lookup"
-#: ../src/gnome-nettool.ui.h:34
+#: ../data/gnome-nettool.ui.h:34
msgid "Lookup output"
msgstr "Lookup išvedimas"
-#: ../src/gnome-nettool.ui.h:35
+#: ../data/gnome-nettool.ui.h:35
msgid "MTU:"
msgstr "MTU:"
-#: ../src/gnome-nettool.ui.h:36
+#: ../data/gnome-nettool.ui.h:36
msgid "Maximum:"
msgstr "Ilgiausias:"
-#: ../src/gnome-nettool.ui.h:37
+#: ../data/gnome-nettool.ui.h:37
msgid "Minimum:"
msgstr "Trumpiausias:"
-#: ../src/gnome-nettool.ui.h:38
+#: ../data/gnome-nettool.ui.h:38
msgid "Multicast Information"
msgstr "Multicast informacija"
-#: ../src/gnome-nettool.ui.h:39
+#: ../data/gnome-nettool.ui.h:39
msgid "Multicast:"
msgstr "Multicast:"
-#: ../src/gnome-nettool.ui.h:40 ../src/main.c:446
+#: ../data/gnome-nettool.ui.h:40
+#: ../src/main.c:446
msgid "Netstat"
msgstr "Netstat"
-#: ../src/gnome-nettool.ui.h:41
+#: ../data/gnome-nettool.ui.h:41
msgid "Netstat output"
msgstr "Netstat išvedimas"
-#: ../src/gnome-nettool.ui.h:42
+#: ../data/gnome-nettool.ui.h:42
msgid "Network address"
msgstr "Tinklo adresas"
-#: ../src/gnome-nettool.ui.h:43
+#: ../data/gnome-nettool.ui.h:43
msgid "Not Available"
msgstr "NÄ?ra"
-#: ../src/gnome-nettool.ui.h:44
+#: ../data/gnome-nettool.ui.h:44
msgid "Only"
msgstr "Tik"
-#: ../src/gnome-nettool.ui.h:45
+#: ../data/gnome-nettool.ui.h:45
msgid "Output for finger"
msgstr "IÅ¡vedimas finger"
-#: ../src/gnome-nettool.ui.h:46
+#: ../data/gnome-nettool.ui.h:46
msgid "Output for lookup"
msgstr "IÅ¡vedimas lookup"
-#: ../src/gnome-nettool.ui.h:47
+#: ../data/gnome-nettool.ui.h:47
msgid "Output for net stat"
msgstr "IÅ¡vedimas net stat"
-#: ../src/gnome-nettool.ui.h:48
+#: ../data/gnome-nettool.ui.h:48
msgid "Output for port scan"
msgstr "Išvedimas prievadų peržiūrai"
-#: ../src/gnome-nettool.ui.h:49
+#: ../data/gnome-nettool.ui.h:49
msgid "Output for traceroute"
msgstr "IÅ¡vedimas traceroute"
-#: ../src/gnome-nettool.ui.h:50
+#: ../data/gnome-nettool.ui.h:50
msgid "Output for whois"
msgstr "IÅ¡vedimas whois"
-#: ../src/gnome-nettool.ui.h:51
+#: ../data/gnome-nettool.ui.h:51
msgid "Packets received:"
msgstr "Gauta paketų:"
-#: ../src/gnome-nettool.ui.h:52
+#: ../data/gnome-nettool.ui.h:52
msgid "Packets transmitted:"
msgstr "Perduota paketų:"
-#: ../src/gnome-nettool.ui.h:53 ../src/main.c:290
+#: ../data/gnome-nettool.ui.h:53
+#: ../src/main.c:290
msgid "Ping"
msgstr "Ping"
-#: ../src/gnome-nettool.ui.h:54
+#: ../data/gnome-nettool.ui.h:54
msgid "Port Scan"
msgstr "Prievadų peržiūra"
-#: ../src/gnome-nettool.ui.h:55
+#: ../data/gnome-nettool.ui.h:55
msgid "Port scan output"
msgstr "Prievadų peržiūros išvedimas"
-#: ../src/gnome-nettool.ui.h:56
+#: ../data/gnome-nettool.ui.h:56
msgid "Received bytes:"
msgstr "Gauta baitų:"
-#: ../src/gnome-nettool.ui.h:57
+#: ../data/gnome-nettool.ui.h:57
msgid "Received packets:"
msgstr "Gauta paketų:"
-#: ../src/gnome-nettool.ui.h:58
+#: ../data/gnome-nettool.ui.h:58
msgid "Reception errors:"
msgstr "PriÄ?mimo klaidos:"
-#: ../src/gnome-nettool.ui.h:59
+#: ../data/gnome-nettool.ui.h:59
msgid "Routing Table Information"
msgstr "MarÅ¡rutų lentelÄ?s informacija"
-#: ../src/gnome-nettool.ui.h:60 ../src/main.c:619
+#: ../data/gnome-nettool.ui.h:60
+#: ../src/main.c:619
msgid "Scan"
msgstr "Rasti"
-#: ../src/gnome-nettool.ui.h:61
+#: ../data/gnome-nettool.ui.h:61
msgid "Send:"
msgstr "Siųsti užklausÄ?:"
-#: ../src/gnome-nettool.ui.h:62
+#: ../data/gnome-nettool.ui.h:62
msgid "State:"
msgstr "BÅ«sena:"
-#: ../src/gnome-nettool.ui.h:63
+#: ../data/gnome-nettool.ui.h:63
msgid "Successful packets:"
msgstr "SÄ?kmingi paketai:"
-#: ../src/gnome-nettool.ui.h:64 ../src/main.c:375
+#: ../data/gnome-nettool.ui.h:64
+#: ../src/main.c:375
msgid "Trace"
msgstr "Sekti"
-#: ../src/gnome-nettool.ui.h:65
+#: ../data/gnome-nettool.ui.h:65
msgid "Traceroute"
msgstr "Traceroute"
-#: ../src/gnome-nettool.ui.h:66
+#: ../data/gnome-nettool.ui.h:66
msgid "Traceroute output"
msgstr "Traceroute išvedimas"
-#: ../src/gnome-nettool.ui.h:67
+#: ../data/gnome-nettool.ui.h:67
msgid "Transmission errors:"
msgstr "Persiuntimo klaidų:"
-#: ../src/gnome-nettool.ui.h:68
+#: ../data/gnome-nettool.ui.h:68
msgid "Transmitted bytes:"
msgstr "Persiųsta baitų:"
-#: ../src/gnome-nettool.ui.h:69
+#: ../data/gnome-nettool.ui.h:69
msgid "Transmitted packets:"
msgstr "Persiųsta paketų:"
-#: ../src/gnome-nettool.ui.h:70
+#: ../data/gnome-nettool.ui.h:70
msgid "Unlimited requests"
msgstr "Neribotai"
-#: ../src/gnome-nettool.ui.h:71
+#: ../data/gnome-nettool.ui.h:71
msgid "User"
msgstr "Naudotojas"
-#: ../src/gnome-nettool.ui.h:72
+#: ../data/gnome-nettool.ui.h:72
msgid "User name"
msgstr "Naudotojo vardas"
-#: ../src/gnome-nettool.ui.h:73 ../src/main.c:920
+#: ../data/gnome-nettool.ui.h:73
+#: ../src/main.c:920
msgid "Whois"
msgstr "Whois"
-#: ../src/gnome-nettool.ui.h:74
+#: ../data/gnome-nettool.ui.h:74
msgid "Whois output"
msgstr "Whois išvedimas"
-#: ../src/gnome-nettool.ui.h:75
+#: ../data/gnome-nettool.ui.h:75
msgid "_Configure"
msgstr "_Konfigūruoti"
-#: ../src/gnome-nettool.ui.h:76
+#: ../data/gnome-nettool.ui.h:76
msgid "_Domain address:"
msgstr "_Domeno adresas:"
-#: ../src/gnome-nettool.ui.h:77
+#: ../data/gnome-nettool.ui.h:77
msgid "_Edit"
msgstr "_Keisti"
-#: ../src/gnome-nettool.ui.h:78
+#: ../data/gnome-nettool.ui.h:78
msgid "_Help"
msgstr "_Pagalba"
-#: ../src/gnome-nettool.ui.h:79
+#: ../data/gnome-nettool.ui.h:79
msgid "_Information type:"
msgstr "_Informacijos tipas"
-#: ../src/gnome-nettool.ui.h:80
+#: ../data/gnome-nettool.ui.h:80
msgid "_Network address:"
msgstr "Ti_nklo adresas:"
-#: ../src/gnome-nettool.ui.h:81
+#: ../data/gnome-nettool.ui.h:81
msgid "_Network device:"
msgstr "Tinklo įre_nginys:"
-#: ../src/gnome-nettool.ui.h:82
+#: ../data/gnome-nettool.ui.h:82
msgid "_Tool"
msgstr "_Programa"
-#: ../src/gnome-nettool.ui.h:83
+#: ../data/gnome-nettool.ui.h:83
msgid "_Username:"
msgstr "_Naudotojo vardas:"
-#: ../src/gnome-nettool.ui.h:84
+#: ../data/gnome-nettool.ui.h:84
msgid "ms"
msgstr "ms"
-#: ../src/gnome-nettool.ui.h:85
+#: ../data/gnome-nettool.ui.h:85
msgid "requests"
msgstr "kartus (-ų)"
@@ -456,7 +470,8 @@ msgstr "Nežinoma sÄ?saja"
msgid "Network Devices Not Found"
msgstr "Nerasta tinklo įrenginių"
-#: ../src/info.c:392 ../src/info.c:395
+#: ../src/info.c:392
+#: ../src/info.c:395
msgid "Unknown"
msgstr "Nežinomas"
@@ -588,14 +603,16 @@ msgstr "ĮRENGINYS"
msgid "Send a ping to a network address"
msgstr "Siųsti ping užklausÄ? adresui"
-#: ../src/main.c:87 ../src/main.c:95 ../src/main.c:99 ../src/main.c:103
+#: ../src/main.c:87
+#: ../src/main.c:95
+#: ../src/main.c:99
+#: ../src/main.c:103
msgid "HOST"
msgstr "KOMPIUTERIS"
#: ../src/main.c:90
msgid "Get netstat information. Valid options are: route, active, multicast."
-msgstr ""
-"Gauti netstat informacijÄ?. Taisyklingi parametrai: route, active, multicast."
+msgstr "Gauti netstat informacijÄ?. Taisyklingi parametrai: route, active, multicast."
#: ../src/main.c:91
msgid "COMMAND"
@@ -631,13 +648,11 @@ msgstr "DOMENAS"
#: ../src/main.c:130
#, c-format
-msgid ""
-"The file %s doesn't exist, please check if gnome-nettool is correctly "
-"installed"
-msgstr ""
-"Failas %s neegzistuoja, patikrinkite ar korektiškai įdiegtas gnome-nettool"
+msgid "The file %s doesn't exist, please check if gnome-nettool is correctly installed"
+msgstr "Failas %s neegzistuoja, patikrinkite ar korektiškai įdiegtas gnome-nettool"
-#: ../src/main.c:482 ../src/netstat.c:443
+#: ../src/main.c:482
+#: ../src/netstat.c:443
msgid "Protocol"
msgstr "Protokolas"
@@ -727,7 +742,8 @@ msgstr "IP Å¡altinis"
msgid "Port/Service"
msgstr "Prievadas/paslauga"
-#: ../src/netstat.c:466 ../src/scan.c:314
+#: ../src/netstat.c:466
+#: ../src/scan.c:314
msgid "State"
msgstr "BÅ«sena"
@@ -747,7 +763,8 @@ msgstr "Å liuzas"
msgid "Netmask"
msgstr "Potinklio kaukÄ?"
-#: ../src/netstat.c:634 ../src/netstat.c:741
+#: ../src/netstat.c:634
+#: ../src/netstat.c:741
msgid "Interface"
msgstr "Įrenginys"
@@ -783,7 +800,8 @@ msgstr "Ä®renginys\tPriklauso\tGrupÄ?\n"
msgid "A network address was not specified"
msgstr "Nenurodytas tinklo adresas"
-#: ../src/nettool.c:200 ../src/nettool.c:209
+#: ../src/nettool.c:200
+#: ../src/nettool.c:209
msgid "Please enter a valid network address and try again."
msgstr "Nurodykite teisingÄ? adresÄ? ir pabandykite iÅ¡ naujo."
@@ -949,15 +967,9 @@ msgstr "Hop\tKompiuterio vardas\tIP\tPir
#: ../src/utils.c:227
#, c-format
-msgid ""
-"In order to use this feature of the program, %s must be installed in your "
-"system"
+msgid "In order to use this feature of the program, %s must be installed in your system"
msgstr "Jei norite naudoti Å¡iÄ? funkcijÄ?, turite įdiegti %s."
-#: ../src/gnome-nettool.desktop.in.in.h:2
-msgid "View information about your network"
-msgstr "Rodyti informacijÄ? apie tinklÄ?"
-
#: ../src/finger.c:63
#, c-format
msgid "Getting information of %s on \"%s\""
diff -pruN 3.0.0-2/po/sk.po 3.0.1-0ubuntu1/po/sk.po
--- 3.0.0-2/po/sk.po 2011-04-04 08:21:10.000000000 +0000
+++ 3.0.1-0ubuntu1/po/sk.po 2011-12-31 23:54:24.000000000 +0000
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the gnome-nettool package.
# Ivan Noris <vix vazka sk>, 2005.
# Peter Tuharsky <tuharsky misbb sk>, 2007.
-# Tomáš Virgl <tomas virgl net>, 2010.
+# Tomáš Virgl <tomas virgl net>, 2010, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: gnome-nettool\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
"nettool&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-03-13 13:51+0000\n"
-"PO-Revision-Date: 2011-03-20 10:22+0100\n"
+"POT-Creation-Date: 2011-04-09 18:07+0000\n"
+"PO-Revision-Date: 2011-04-26 11:16+0200\n"
"Last-Translator: Tomáš Virgl <tomas virgl net>\n"
"Language-Team: Slovak <gnome-sk-list gnome org>\n"
"MIME-Version: 1.0\n"
@@ -63,27 +63,27 @@ msgstr "Zobraziť informácie o vašej s
#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:1
msgid "A list of domains previously used"
-msgstr ""
+msgstr "Zoznam skôr použitých domén"
#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:2
msgid "A list of hostnames previously used"
-msgstr ""
+msgstr "Zoznam skôr použitých názvov hostiteľa"
#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:3
msgid "A list of usernames previously used"
-msgstr ""
+msgstr "Zoznam skôr použitých použÃvateľských mien"
#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:4
msgid "Historically used domains"
-msgstr ""
+msgstr "História použitých domén"
#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:5
msgid "Historically used hostnames"
-msgstr ""
+msgstr "História použitých názvov hostiteľa"
#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:6
msgid "Historically used usernames"
-msgstr ""
+msgstr "História použitých použÃvateľských mien"
#: ../data/gnome-nettool.ui.h:1
msgid "0"
@@ -710,10 +710,9 @@ msgstr "CPU / Typ OS"
msgid "Mailbox Exchange"
msgstr "Záznam MX"
-#, fuzzy
#: ../src/main.c:673
msgid "Mailbox Information"
-msgstr "Mailbox Information"
+msgstr "Informácia o zázname MX"
#. When asking for NS record in DNS context
#: ../src/main.c:675
diff -pruN 3.0.0-2/po/ta.po 3.0.1-0ubuntu1/po/ta.po
--- 3.0.0-2/po/ta.po 2011-04-04 08:21:10.000000000 +0000
+++ 3.0.1-0ubuntu1/po/ta.po 2011-12-31 23:54:24.000000000 +0000
@@ -4,21 +4,23 @@
#
# Jayaradha N <jaya pune redhat com>, 2004.
# Felix <ifelix redhat com>, 2006.
-# Dr.T.Vasudevan <agnihot3 gmail com>, 2007.
+# Dr.T.Vasudevan <agnihot3 gmail com>, 2007, 2011.
# I. Felix <ifelix redhat com>, 2008, 2009.
msgid ""
msgstr ""
"Project-Id-Version: gnome-nettool.HEAD.ta\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-02 05:12+0530\n"
-"PO-Revision-Date: 2009-03-12 06:11+0530\n"
-"Last-Translator: I. Felix <ifelix redhat com>\n"
+"POT-Creation-Date: 2011-09-13 19:57+0530\n"
+"PO-Revision-Date: 2011-09-13 20:02+0530\n"
+"Last-Translator: Dr.T.Vasudevan <agnihot3 gmail com>\n"
"Language-Team: Tamil <fedora-trans-ta redhat com>\n"
+"Language: ta\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\\n\n"
+"X-Generator: Lokalize 1.1\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\\n"
+"\n"
"\n"
"\n"
"\n"
@@ -26,7 +28,7 @@ msgstr ""
#: ../src/callbacks.c:332
msgid "translator-credits"
-msgstr "Tirumurthi Vasudevan, 2008, 2009"
+msgstr "Tirumurthi Vasudevan, 2008, 2009,2010,2011"
#. Translators: %s is the name of the copyright holder
#: ../src/callbacks.c:339
@@ -44,7 +46,7 @@ msgstr "வலà¯?பà¯?பினà¯?னà®
msgid "Graphical user interface for common network utilities"
msgstr "ப�த�வான வல�ப�பின�னல� பயன�பா���ள����ன �ித�திர பயன����ாளர� ���ம��ம�"
-#: ../src/callbacks.c:458 ../src/main.c:142 ../src/nettool.c:483
+#: ../src/callbacks.c:458 ../src/main.c:142 ../src/nettool.c:488
msgid "Idle"
msgstr "வ�ற�ம�"
@@ -65,27 +67,27 @@ msgstr "வலà¯?பà¯?பினà¯?னà®
#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:1
msgid "A list of domains previously used"
-msgstr ""
+msgstr "ம�ன�ப� பயன�ப��த�திய ��ம�ய�ன��ளின� ப���ியல�"
#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:2
msgid "A list of hostnames previously used"
-msgstr ""
+msgstr "ம�ன�ப� பயன�ப��த�திய ப�ரவலன� ப�யர��ளின� ப���ியல�"
#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:3
msgid "A list of usernames previously used"
-msgstr ""
+msgstr "ம�ன�ப� பயன�ப��த�திய பயனர� ப�யர��ளின� ப���ியல�"
#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:4
msgid "Historically used domains"
-msgstr ""
+msgstr "�த� வர� பயன�ப��த�திய ��ம�ய�ன��ள�"
#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:5
msgid "Historically used hostnames"
-msgstr ""
+msgstr "�த� வர� பயன�ப��த�திய ப�ரவலன� ப�யர��ள�"
#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:6
msgid "Historically used usernames"
-msgstr ""
+msgstr "�த� வர� பயன�ப��த�திய பயனர� ப�யர��ள�"
#: ../data/gnome-nettool.ui.h:1
msgid "0"
@@ -189,8 +191,7 @@ msgstr ""
"com �ல�லத� 192.168.2.1"
#: ../data/gnome-nettool.ui.h:24
-msgid ""
-"Enter the network address to ping. For example: www.domain.com or 192.168.2.1"
+msgid "Enter the network address to ping. For example: www.domain.com or 192.168.2.1"
msgstr ""
"��ண��ிப�பார���� (பி��) �ர� வல�ப�பின�னல� ம��வரிய� �ள�ளி�வ�ம�. �தாரணமா� : www.domain.com "
"�ல�லத� 192.168.2.1"
@@ -564,33 +565,33 @@ msgstr "பà¯?à®±à¯?à®±à¯?à®?à¯?à®?à¯?à®
msgid "Collisions:\t%s\n"
msgstr "ம�தல�:\t%s\n"
-#: ../src/info.h:27
+#: ../src/info.h:24
msgid "not available"
msgstr "�ி�����வில�ல�"
-#: ../src/lookup.c:80
+#: ../src/lookup.c:85
#, c-format
msgid "Looking up %s"
msgstr "ம�ல� பார����ிறத� %s"
-#: ../src/lookup.c:274
+#: ../src/lookup.c:279
msgid "Name"
msgstr "ப�யர�"
#. Time To Live of a hostname in a name server
-#: ../src/lookup.c:283
+#: ../src/lookup.c:288
msgid "TTL"
msgstr "TTL"
-#: ../src/lookup.c:292
+#: ../src/lookup.c:297
msgid "Address Type"
msgstr "ம��வரி வ��"
-#: ../src/lookup.c:302
+#: ../src/lookup.c:307
msgid "Record Type"
msgstr "பதிப�ப� வ��"
-#: ../src/lookup.c:311
+#: ../src/lookup.c:316
msgid "Address"
msgstr "ம��வரி"
@@ -600,7 +601,7 @@ msgstr "ம��வரி"
#. Record Type (A, PTR, HINFO, NS, TXT, etc.),
#. Resolution (results of the query)
#. It's a tabular output, and these belongs to the column titles
-#: ../src/lookup.c:339
+#: ../src/lookup.c:344
msgid "Source\tTTL\tAddress Type\tRecord Type1\tResolution\n"
msgstr "ம�லம�\tTTL\tம��வரிவ��\tபதிப�ப� வ��1\tத�ளிவ�த�திறன�\n"
@@ -665,7 +666,7 @@ msgid ""
"installed"
msgstr "��ப�ப� %s� �ாணவில�ல�, gnome-netinfo �ரியா� நிற�வப�ப���தா �ன�பத� �ரிபார����வ�ம�"
-#: ../src/main.c:482 ../src/netstat.c:443
+#: ../src/main.c:482 ../src/netstat.c:455
msgid "Protocol"
msgstr "விதிம�ற��ள�"
@@ -735,142 +736,142 @@ msgstr "நனà¯?à®?à¯? தà¯?ரிநà
msgid "Any / All Information"
msgstr "�தாவத� / �ன�த�த� த�வல�"
-#: ../src/netstat.c:122
+#: ../src/netstat.c:134
msgid "Getting routing table"
msgstr "பாத� ����வண�ய� ப�ற��ிறத�"
-#: ../src/netstat.c:137
+#: ../src/netstat.c:149
msgid "Getting active Internet connections"
msgstr "��யல�பா���ில� �ள�ள �ண�ய �ண�ப�ப� ப�ற��ிறத�"
-#: ../src/netstat.c:146
+#: ../src/netstat.c:158
msgid "Getting group memberships"
msgstr "��ழ� �ற�ப�பினர� த�வல� ப�ற��ிறத�"
-#: ../src/netstat.c:450
+#: ../src/netstat.c:462
msgid "IP Source"
msgstr "IP ம�லம�"
-#: ../src/netstat.c:458
+#: ../src/netstat.c:470
msgid "Port/Service"
msgstr "பாத�/��வ�"
-#: ../src/netstat.c:466 ../src/scan.c:314
+#: ../src/netstat.c:478 ../src/scan.c:318
msgid "State"
msgstr "நில�"
-#: ../src/netstat.c:609
+#: ../src/netstat.c:632
msgid "Destination/Prefix"
msgstr "�ல����/ம�ன� �����"
-#: ../src/netstat.c:611
+#: ../src/netstat.c:634
msgid "Destination"
msgstr "�ல����"
-#: ../src/netstat.c:618
+#: ../src/netstat.c:641
msgid "Gateway"
msgstr "ந�ழ�வாயில�"
-#: ../src/netstat.c:626
+#: ../src/netstat.c:649
msgid "Netmask"
msgstr "ந���மாஸ���"
-#: ../src/netstat.c:634 ../src/netstat.c:741
+#: ../src/netstat.c:657 ../src/netstat.c:764
msgid "Interface"
msgstr "���ம��ம�"
-#: ../src/netstat.c:748
+#: ../src/netstat.c:771
msgid "Member"
msgstr "�ற�ப�பினர�"
-#: ../src/netstat.c:756
+#: ../src/netstat.c:779
msgid "Group"
msgstr "��ழ�"
#. The netstat "Display active network services" output in
#. text format.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/netstat.c:798
+#: ../src/netstat.c:821
msgid "Protocol\tIP Source\tPort/Service\tState\n"
msgstr "விதிம�ற�\tIP ம�லம�\tவழி/��வ�\tநில�\n"
#. The netstat "Display routing" output in text format.
#. This seems as a route table.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/netstat.c:804
+#: ../src/netstat.c:827
msgid "Destination\tGateway\tNetmask\tInterface\n"
msgstr "�ல����\tந�ழ�வாயில�\tந���மாஸ���\t���ம��ம�\n"
#. The netstat "Multicast information" output in text format.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/netstat.c:809
+#: ../src/netstat.c:832
msgid "Interface\tMember\tGroup\n"
msgstr "���ம��ம�\t�ற�ப�பினர�\t��ழ�\n"
-#: ../src/nettool.c:199
+#: ../src/nettool.c:204
msgid "A network address was not specified"
msgstr "வல�ப�பின�னல� ம��வரி ��றிப�பி�ப�ப�வில�ல�"
-#: ../src/nettool.c:200 ../src/nettool.c:209
+#: ../src/nettool.c:205 ../src/nettool.c:214
msgid "Please enter a valid network address and try again."
msgstr "�ரியான வல�ப�பின�னல� ம��வரிய� �ள�ளி���� ம�ண���ம� ம�யற��ி���வ�ம�"
-#: ../src/nettool.c:207
+#: ../src/nettool.c:212
#, c-format
msgid "The address '%s' cannot be found"
msgstr "ம��வரி '%s' � �ாணவில�ல�"
-#: ../src/nettool.c:236
+#: ../src/nettool.c:241
msgid "A domain address was not specified"
msgstr "��ம�ன� ம��வரி ��றிப�பி�ப�ப�வில�ல�"
-#: ../src/nettool.c:237
+#: ../src/nettool.c:242
msgid "Please enter a valid domain address and try again."
msgstr "�ரியான ��ம�ன� ம��வரிய� �ள�ளி���� ம�ண���ம� ம�யற��ி���வ�ம�"
-#: ../src/nettool.c:428
+#: ../src/nettool.c:433
msgid "Information not available"
msgstr "த�வல� �ல�ல�"
-#: ../src/nettool.c:548
+#: ../src/nettool.c:553
msgid "Stop"
msgstr "நிற�த�த�"
-#: ../src/nettool.c:554
+#: ../src/nettool.c:559
msgid "Run"
msgstr "�ய����"
#. Created up here so we can get the geometry info.
-#: ../src/ping.c:151
+#: ../src/ping.c:155
msgid "Time (ms):"
msgstr "ந�ரம� (மில�லி.���ண���):"
-#: ../src/ping.c:172
+#: ../src/ping.c:176
msgid "Seq. No.:"
msgstr "வரி�� �ண�:"
-#: ../src/ping.c:257
+#: ../src/ping.c:261
#, c-format
msgid "Sending ping requests to %s"
msgstr "பி�� ��ரி����ய� %s ���� �ன�ப�ப��ிறத�"
-#: ../src/ping.c:572
+#: ../src/ping.c:577
msgid "Bytes"
msgstr "ப����ள�"
-#: ../src/ping.c:579
+#: ../src/ping.c:584
msgid "Source"
msgstr "ம�லம�"
-#: ../src/ping.c:587
+#: ../src/ping.c:592
msgid "Seq"
msgstr "Seq"
-#: ../src/ping.c:597
+#: ../src/ping.c:602
msgid "Time"
msgstr "ந�ரம�"
-#: ../src/ping.c:605
+#: ../src/ping.c:610
msgid "Units"
msgstr "�ல���ள�"
@@ -878,92 +879,92 @@ msgstr "�ல���ள�"
#. Bytes received, Address Source, Number of Sequence,
#. Round Trip Time (Time), Units of Time.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/ping.c:631
+#: ../src/ping.c:636
msgid "Bytes\tSource\tSeq\tTime\tUnits\n"
msgstr "ப����ள�\tம�லம�\tவரி��\tந�ரம�\t�ல��\n"
#. The ping output in a text format (to copy on clipboard)
-#: ../src/ping.c:646
+#: ../src/ping.c:651
#, c-format
msgid "Time minimum:\t%s ms\n"
msgstr "��ற�ந�தப��� ந�ரம�:\t%s ms\n"
-#: ../src/ping.c:647
+#: ../src/ping.c:652
#, c-format
msgid "Time average:\t%s ms\n"
msgstr "�ரா�ரி ந�ரம�:\t%s ms\n"
-#: ../src/ping.c:648
+#: ../src/ping.c:653
#, c-format
msgid "Time maximum:\t%s ms\n"
msgstr "�தி�ப��� ந�ரம�:\t%s ms\n"
-#: ../src/ping.c:650
+#: ../src/ping.c:655
#, c-format
msgid "Packets transmitted:\t%s\n"
msgstr "�ன�ப�பப��� ������ள�:\t%s\n"
-#: ../src/ping.c:652
+#: ../src/ping.c:657
#, c-format
msgid "Packets received:\t%s\n"
msgstr "ப�றப�ப��� ������ள�:\t%s\n"
-#: ../src/ping.c:655
+#: ../src/ping.c:660
#, c-format
msgid "Successful packets:\t%s\n"
msgstr "வ�ற�றி�ரமான ������ள�:\t%s\n"
-#: ../src/scan.c:94
+#: ../src/scan.c:98
#, c-format
msgid "Scanning %s for open ports"
msgstr "%s � திறந�த வழி���ா� த����ிறத�"
-#: ../src/scan.c:169
+#: ../src/scan.c:173
msgid "unknown"
msgstr "த�ரியாத"
#. Translators: "open" is a network status and should be one word.
-#: ../src/scan.c:173
+#: ../src/scan.c:177
msgid "open"
msgstr "திற"
-#: ../src/scan.c:306
+#: ../src/scan.c:310
msgid "Port"
msgstr "வழி"
-#: ../src/scan.c:322
+#: ../src/scan.c:326
msgid "Service"
msgstr "��வ�"
#. The portscan output in text format:
#. Port, State, Service.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/scan.c:344
+#: ../src/scan.c:348
msgid "Port\tState\tService\n"
msgstr "வழி\tநில�\t��வ�\n"
-#: ../src/traceroute.c:62
+#: ../src/traceroute.c:66
#, c-format
msgid "Tracing route to %s"
msgstr "பாத�ய� த����ிறத� %s"
-#: ../src/traceroute.c:265
+#: ../src/traceroute.c:269
msgid "Hop"
msgstr "Hop"
-#: ../src/traceroute.c:273
+#: ../src/traceroute.c:277
msgid "Hostname"
msgstr "ப�ரவலன� ப�யர�"
-#: ../src/traceroute.c:281
+#: ../src/traceroute.c:285
msgid "IP"
msgstr "IP"
-#: ../src/traceroute.c:292
+#: ../src/traceroute.c:296
msgid "Time 1"
msgstr "ந�ரம� 1"
-#: ../src/traceroute.c:302
+#: ../src/traceroute.c:306
msgid "Time 2"
msgstr "ந�ரம� 2"
@@ -971,28 +972,29 @@ msgstr "ந�ரம� 2"
#. Hop count, Hostname, IP, Round Trip Time 1 (Time1),
#. Round Trip Time 2 (Time2),
#. It's a tabular output, and these belongs to the column titles
-#: ../src/traceroute.c:328
+#: ../src/traceroute.c:332
msgid "Hop\tHostname\tIP\tTime 1\tTime 2\n"
msgstr "Hop\tப�ரவலன� ப�யர�\tIP\tந�ரம� 1\tந�ரம� 2\n"
-#: ../src/utils.c:227
+#: ../src/utils.c:231
#, c-format
msgid ""
"In order to use this feature of the program, %s must be installed in your "
"system"
msgstr "�ந�த நிரலின� வ�தி�ள� பயன�ப��த�த, %s ����ள� �ணினியில� நிற�வ வ�ண���ம�"
-#: ../src/finger.c:63
+#: ../src/finger.c:66
#, c-format
msgid "Getting information of %s on \"%s\""
msgstr "%s �ல� \"%s\" ���ான த�வல� ப�ற��ிறத�"
-#: ../src/finger.c:67
+#: ../src/finger.c:70
#, c-format
msgid "Getting information of all users on \"%s\""
msgstr "\"%s\" ���ான த�வல� ப�ற��ிறத�"
-#: ../src/whois.c:58
+#: ../src/whois.c:62
#, c-format
msgid "Getting the whois information of %s"
msgstr "%s ���ான யாரத� த�வல� ப�ற��ிறத�."
+
diff -pruN 3.0.0-2/po/te.po 3.0.1-0ubuntu1/po/te.po
--- 3.0.0-2/po/te.po 2010-12-02 09:26:14.000000000 +0000
+++ 3.0.1-0ubuntu1/po/te.po 2011-12-31 23:54:24.000000000 +0000
@@ -5,26 +5,31 @@
#
# Pramod <pramod swecha net>, 2007.
# Krishna Babu K <kkrothap redhat com>, 2009.
+# Hari Krishna <hari swecha net>, 2011.
+# Krishnababu Krothapalli <kkrothap redhat com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: gnome-nettool.master.te\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-nettool&component=general\n";
-"POT-Creation-Date: 2009-05-04 03:50+0000\n"
-"PO-Revision-Date: 2009-09-17 15:22+0530\n"
-"Last-Translator: Krishna Babu K <kkrothap redhat com>\n"
-"Language-Team: Telugu <en li org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
+"nettool&component=general\n"
+"POT-Creation-Date: 2010-11-10 22:40+0000\n"
+"PO-Revision-Date: 2011-10-07 15:25+0530\n"
+"Last-Translator: Krishnababu Krothapalli <kkrothap redhat com>\n"
+"Language-Team: Telugu <Indlinux-telugu lists sourceforge net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
"\n"
+"\n"
+"Language: te\n"
#: ../src/callbacks.c:323
msgid "translator-credits"
msgstr ""
-"Pramod <pramod swecha net> "
-"��ష�ణబాబ� �� <kkrothap redhat com> "
+"Pramod <pramod swecha net> ,��ష�ణబాబ� �� <kkrothap redhat com>,Hari Krishna <"
+"hari swecha net> "
#. Translators: %s is the name of the copyright holder
#: ../src/callbacks.c:330
@@ -34,124 +39,153 @@ msgstr "�ాప�హ���� © 2
#. Dear translator: This is the name of the application
#: ../src/callbacks.c:334 ../src/callbacks.c:335
-#: ../src/gnome-nettool.desktop.in.in.h:1
+#: ../data/gnome-nettool.desktop.in.in.h:1
msgid "Network Tools"
-msgstr "�ల�లి� పనిమ���ల�"
+msgstr "న���వర��� పనిమ���ల�"
#: ../src/callbacks.c:337
msgid "Graphical user interface for common network utilities"
-msgstr "సాధారణమà±?à°¨ à°?à°²à±?లిà°? à°¸à±?à°²à°à±?యాల à°?à±?à°°à°?à±? à°?à°¿à°¤à±?à°°à°°à±?à°ª వినియà±?à°?దారà±? à°¸à°?విధానà°?"
+msgstr "సాధారణమà±?à°¨ à°¨à±?à°?à±?వరà±?à°?à±? à°¸à±?à°²à°à±?యాల à°?à±?à°°à°?à±? à°?à°¿à°¤à±?à°°à°°à±?à°ª వాడà±?à°?à°°à°¿ à°¸à°?విధానà°?"
-#: ../src/callbacks.c:450 ../src/main.c:142 ../src/nettool.c:461
+#: ../src/callbacks.c:449 ../src/main.c:142 ../src/nettool.c:483
msgid "Idle"
msgstr "స�థిరమ�న"
#. Dear Translator: This is the Window Title. 'Network Tools' is the
#. * name of the application
-#: ../src/callbacks.c:455
+#: ../src/callbacks.c:454
#, c-format
msgid "%s - Network Tools"
-msgstr "%s - �ల�లి� పనిమ���ల�"
+msgstr "%s - న���వర��� పనిమ���ల�"
-#: ../src/callbacks.c:479
+#: ../src/callbacks.c:478
msgid "Unable to open help file"
-msgstr "సహాయ దస�త�రమ�న� త�ర�వల�� ప�యి�ది"
+msgstr "సహాయ ఫ�ల�న� త�ర�వల�� ప�యి�ది"
+
+#: ../data/gnome-nettool.desktop.in.in.h:2
+msgid "View information about your network"
+msgstr "మ� య���� న���వర��� ��రి��ి సమా�ారమ�న� దర�శి���మ�"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:1
+msgid "A list of domains previously used"
+msgstr "మ��ద� �పయ��ి��ిన �ార�య��ష�త�రమ�ల �ాబితా "
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:2
+msgid "A list of hostnames previously used"
+msgstr "మ��ద� �పయ��ి��ిన �తిధ�య ప�ర�ల �ాబితా"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:3
+msgid "A list of usernames previously used"
+msgstr "మ��ద� �పయ��ి��ిన వాడ��రి ప�ర�ల �ాబితా"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:4
+msgid "Historically used domains"
+msgstr "�పయ��ి��ిన �ార�య��ష�త�రమ�ల �రిత�ర "
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:5
+msgid "Historically used hostnames"
+msgstr "�పయ��ి��ిన �తిధ�యప�ర�ల �రిత�ర "
-#: ../src/gnome-nettool.glade.h:1
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:6
+msgid "Historically used usernames"
+msgstr "�పయ��ి��ిన వాడ��రి ప�ర�ల �రిత�ర "
+
+#: ../data/gnome-nettool.ui.h:1
msgid "0"
msgstr "0"
-#: ../src/gnome-nettool.glade.h:3
+#: ../data/gnome-nettool.ui.h:3
#, no-c-format
msgid "0%"
msgstr "0%"
-#: ../src/gnome-nettool.glade.h:4
+#: ../data/gnome-nettool.ui.h:4
msgid "0.0"
msgstr "0.0"
-#: ../src/gnome-nettool.glade.h:5
+#: ../data/gnome-nettool.ui.h:5
msgid "<b>IP Information</b>"
msgstr "<b>IP సమా�ారమ�</b>"
-#: ../src/gnome-nettool.glade.h:6
+#: ../data/gnome-nettool.ui.h:6
msgid "<b>Interface Information</b>"
msgstr "<b>స�విధాన సమా�ారమ�</b>"
-#: ../src/gnome-nettool.glade.h:7
+#: ../data/gnome-nettool.ui.h:7
msgid "<b>Interface Statistics</b>"
msgstr "<b>స�విధాన �ణా��ాల�</b>"
-#: ../src/gnome-nettool.glade.h:8
+#: ../data/gnome-nettool.ui.h:8
msgid "<b>Round Trip Time Statistics</b>"
msgstr "<b>���డ�రని యాత�ర సమయ �ణా��ాల�</b>"
-#: ../src/gnome-nettool.glade.h:9
+#: ../data/gnome-nettool.ui.h:9
msgid "<b>Transmission Statistics</b>"
msgstr "<b>ప�రసరణ �ణా��ాల�</b>"
-#: ../src/gnome-nettool.glade.h:10
+#: ../data/gnome-nettool.ui.h:10
msgid "Active Network Services"
-msgstr "�ల�లి� స�వన� ��రియాశ�ల���య�"
+msgstr "న���వర��� స�వన� ��రియాశ�ల���య�"
-#: ../src/gnome-nettool.glade.h:11
+#: ../data/gnome-nettool.ui.h:11
msgid "Average:"
msgstr "స���:"
-#: ../src/gnome-nettool.glade.h:12
+#: ../data/gnome-nettool.ui.h:12
msgid "Beep on ping"
msgstr "పి��� ప� బ�ప� శబ�ధ�"
-#: ../src/gnome-nettool.glade.h:13
+#: ../data/gnome-nettool.ui.h:13
msgid "Clear _History"
-msgstr "_à°?à°°à°¿à°¤à±?à°° à°¶à±?à°à±?à°°à°?à°?à±?à°¯à±?"
+msgstr "à°?à°°à°¿à°¤à±?à°° à°¶à±?à°à±?à°°à°?à°?à±?à°¯à±? (_H)"
-#: ../src/gnome-nettool.glade.h:14
+#: ../data/gnome-nettool.ui.h:14
msgid "Collisions:"
msgstr "ఢ���న��:"
-#: ../src/gnome-nettool.glade.h:15
+#: ../data/gnome-nettool.ui.h:15
msgid "Copy as text _report"
msgstr "పాఠ�యప� నివ�ది�వల� న�ల�త�య�మ� (_r)"
-#: ../src/gnome-nettool.glade.h:16
+#: ../data/gnome-nettool.ui.h:16
msgid "Details"
msgstr "వివరమ�ల�"
-#: ../src/gnome-nettool.glade.h:17
+#: ../data/gnome-nettool.ui.h:17
msgid "Devices"
msgstr "పరి�రాల�"
-#. Dear Translator: This is the Window Title
-#: ../src/gnome-nettool.glade.h:19
+#: ../data/gnome-nettool.ui.h:18
msgid "Devices - Network Tools"
-msgstr "పరి�రాల� - �ల�లి� పనిమ���ల�"
+msgstr "పరి�రాల� - న���వర��� పనిమ���ల�"
-#: ../src/gnome-nettool.glade.h:20
+#: ../data/gnome-nettool.ui.h:19
msgid "Display:"
msgstr "ప�రదర�శి���:"
-#: ../src/gnome-nettool.glade.h:21
+#: ../data/gnome-nettool.ui.h:20
msgid "Domain address"
msgstr "డ�మ�న� �ిర�నామా"
-#: ../src/gnome-nettool.glade.h:22
+#: ../data/gnome-nettool.ui.h:21
msgid ""
"Enter a domain address to lookup its whois information. For example: www."
"domain.com or 192.168.2.1"
msgstr ""
"whois సమా�ారమ�న� ��డ���� డ�మ�న� �ిర�నామాన� ప�రవ�శప�����డి. �దాహరణ��: www."
-"domain.com ల�దా 192.168.2.1"
+"domain.com ల�దా "
+"192.168.2.1"
-#: ../src/gnome-nettool.glade.h:23
+#: ../data/gnome-nettool.ui.h:22
msgid ""
"Enter the network address to finger that user. For example: www.domain.com "
"or 192.168.2.1"
msgstr ""
-"వినియ��దారిని ��ప���� న���వర��� �ిర�నామాన� ప�రవ�శప�����డి. �దాహరణ��: www.domain.com "
-"ల�దా 192.168.2.1"
+"వాడ��రిని ��ప���� న���వర��� �ిర�నామాన� ప�రవ�శప�����డి. �దాహరణ��: www.domain."
+"com ల�దా "
+"192.168.2.1"
-#: ../src/gnome-nettool.glade.h:24
+#: ../data/gnome-nettool.ui.h:23
msgid ""
"Enter the network address to lookup. For example: www.domain.com or "
"192.168.2.1"
@@ -159,262 +193,266 @@ msgstr ""
"��డ���� న���వర��� �ిర�నామాన� ప�రవ�శప�����మ�. �దాహరణ��: www.domain.com ల�దా "
"192.168.2.1"
-#: ../src/gnome-nettool.glade.h:25
-msgid "Enter the network address to ping. For example: www.domain.com or 192.168.2.1"
+#: ../data/gnome-nettool.ui.h:24
+msgid ""
+"Enter the network address to ping. For example: www.domain.com or 192.168.2.1"
msgstr ""
-"పి��� ��య���� న���వర��� �ిర�నామాన� ప�రవ�శప�����మ�. �దాహరణ��: www.domain.com ల�దా "
-"192.168.2.1"
+"పి��� ��య���� న���వర��� �ిర�నామాన� ప�రవ�శప�����మ�. �దాహరణ��: www.domain.com "
+"ల�దా 192.168.2.1"
-#: ../src/gnome-nettool.glade.h:26
+#: ../data/gnome-nettool.ui.h:25
msgid ""
"Enter the network address to scan for open ports. For example: www.domain."
"com or 192.168.2.1"
-msgstr "త�రి�ిన ప�ర���లన� స��ాన���య���� న���వర��� �ిర�నామాన� ప�రవ�శప�����డి. �దాహరణ��: www.domain.com ల�దా 192.168.2.1"
+msgstr ""
+"త�రి�ిన ప�ర���లన� స��ాన���య���� న���వర��� �ిర�నామాన� ప�రవ�శప�����డి. "
+"�దాహరణ��: www.domain.com ల�దా "
+"192.168.2.1"
-#: ../src/gnome-nettool.glade.h:27
+#: ../data/gnome-nettool.ui.h:26
msgid ""
"Enter the network address to trace a route to. For example: www.domain.com "
"or 192.168.2.1"
msgstr ""
-"à°¦à±?నిà°?à°¿ à°°à±?à°?à±?â??à°¨à±? à°?à±?à°°à±?à°¸à±? à°?à±?à°¯à±?à°?à°?à±? à°¨à±?à°?à±?వరà±?à°?à±? à°?à°¿à°°à±?నామానà±? à°ªà±?à°°à°µà±?శపà±?à°?à±?à°?à±?à°®à±?. à°?దాహరణà°?à±?: www.domain.com à°²à±?దా "
+"à°¦à±?నిà°?à°¿ à°°à±?à°?à±?â??à°¨à±? à°?à±?à°°à±?à°¸à±? à°?à±?à°¯à±?à°?à°?à±? à°¨à±?à°?à±?వరà±?à°?à±? à°?à°¿à°°à±?నామానà±? à°ªà±?à°°à°µà±?శపà±?à°?à±?à°?à±?à°®à±?. à°?దాహరణà°?à±?: "
+"www.domain.com ల�దా "
"192.168.2.1"
-#: ../src/gnome-nettool.glade.h:28
+#: ../data/gnome-nettool.ui.h:27
msgid "Enter the user to finger"
-msgstr "��ప���� వినియ��దారిని ప�రవ�శప�����మ�"
+msgstr "��ప���� వాడ��రిని ప�రవ�శప�����మ�"
-#: ../src/gnome-nettool.glade.h:29 ../src/main.c:814
+#: ../data/gnome-nettool.ui.h:28 ../src/main.c:814
msgid "Finger"
msgstr "వ�ల�"
-#: ../src/gnome-nettool.glade.h:30
+#: ../data/gnome-nettool.ui.h:29
msgid "Finger output"
msgstr "à°µà±?à°²à±? à°?à°µà±?à°?à±?â??à°ªà±?à°?à±?"
-#: ../src/gnome-nettool.glade.h:31
+#: ../data/gnome-nettool.ui.h:30
msgid "Hardware address:"
msgstr "����ిసర��� సమా�ారమ�:"
-#: ../src/gnome-nettool.glade.h:32
+#: ../data/gnome-nettool.ui.h:31
msgid "Host"
msgstr "�తిథ�య�"
-#: ../src/gnome-nettool.glade.h:33
+#: ../data/gnome-nettool.ui.h:32
msgid "Link speed:"
msgstr "��డి వ��మ�:"
-#: ../src/gnome-nettool.glade.h:34 ../src/main.c:734
+#: ../data/gnome-nettool.ui.h:33 ../src/main.c:734
msgid "Lookup"
msgstr "వ�త������"
-#: ../src/gnome-nettool.glade.h:35
+#: ../data/gnome-nettool.ui.h:34
msgid "Lookup output"
msgstr "à°²à±?à°?à°ªà±? à°?à°µà±?à°?à±?â??à°ªà±?à°?à±?"
-#: ../src/gnome-nettool.glade.h:36
+#: ../data/gnome-nettool.ui.h:35
msgid "MTU:"
msgstr "���ియ�:"
-#: ../src/gnome-nettool.glade.h:37
+#: ../data/gnome-nettool.ui.h:36
msgid "Maximum:"
msgstr "�త�యధి�:"
-#: ../src/gnome-nettool.glade.h:38
+#: ../data/gnome-nettool.ui.h:37
msgid "Minimum:"
msgstr "�త�యల�ప:"
-#: ../src/gnome-nettool.glade.h:39
+#: ../data/gnome-nettool.ui.h:38
msgid "Multicast Information"
msgstr "�����య� సమా�ారమ�"
-#: ../src/gnome-nettool.glade.h:40
+#: ../data/gnome-nettool.ui.h:39
msgid "Multicast:"
msgstr "�����య�:"
-#: ../src/gnome-nettool.glade.h:41 ../src/main.c:446
+#: ../data/gnome-nettool.ui.h:40 ../src/main.c:446
msgid "Netstat"
msgstr "న��� స��ా��"
-#: ../src/gnome-nettool.glade.h:42
+#: ../data/gnome-nettool.ui.h:41
msgid "Netstat output"
msgstr "à°¨à±?à°?à±?â??à°¸à±?à°?à°¾à°?à±? à°?à°µà±?à°?à±?â??à°ªà±?à°?à±?"
-#: ../src/gnome-nettool.glade.h:43
+#: ../data/gnome-nettool.ui.h:42
msgid "Network address"
msgstr "న���వర��� �ిర�నామా"
-#: ../src/gnome-nettool.glade.h:44
+#: ../data/gnome-nettool.ui.h:43
msgid "Not Available"
msgstr "à°²à°à°¿à°?à°?à°²à±?à°¦à±?"
-#: ../src/gnome-nettool.glade.h:45
+#: ../data/gnome-nettool.ui.h:44
msgid "Only"
msgstr "మాత�రమ�"
-#: ../src/gnome-nettool.glade.h:46
+#: ../data/gnome-nettool.ui.h:45
msgid "Output for finger"
msgstr "à°µà±?à°²à±? à°?à±?à°°à°?à±? à°?à°µà±?à°?à±?â??à°ªà±?à°?à±?"
-#: ../src/gnome-nettool.glade.h:47
+#: ../data/gnome-nettool.ui.h:46
msgid "Output for lookup"
msgstr "à°²à±?à°?à°ªà±? à°?à±?à°°à°?à±? à°?à°µà±?à°?à±?â??à°ªà±?à°?à±?"
-#: ../src/gnome-nettool.glade.h:48
+#: ../data/gnome-nettool.ui.h:47
msgid "Output for net stat"
msgstr "à°¨à±?à°?à±? à°¸à±?à°?à°¾à°?à±? à°?à±?à°°à°?à±? à°?à°µà±?à°?à±?â??à°ªà±?à°?à±?"
-#: ../src/gnome-nettool.glade.h:49
+#: ../data/gnome-nettool.ui.h:48
msgid "Output for port scan"
msgstr "à°ªà±?à°°à±?à°?à±? à°¸à±?à°?ానà±? à°?à±?à°°à°?à±? à°?à°µà±?à°?à±?â??à°ªà±?à°?à±?"
-#: ../src/gnome-nettool.glade.h:50
+#: ../data/gnome-nettool.ui.h:49
msgid "Output for traceroute"
msgstr "à°?à±?à°°à±?à°¸à±?â??à°°à±?à°?à±? à°?à±?à°°à°?à±? à°?à°µà±?à°?à±?â??à°ªà±?à°?à±?"
-#: ../src/gnome-nettool.glade.h:51
+#: ../data/gnome-nettool.ui.h:50
msgid "Output for whois"
msgstr "à°¹à±?à°?à°?à±? à°?à±?à°°à°?à±? à°?à°µà±?à°?à±?â??à°ªà±?à°?à±?"
-#: ../src/gnome-nettool.glade.h:52
+#: ../data/gnome-nettool.ui.h:51
msgid "Packets received:"
msgstr "ప���లాల� త�స���నబడినవి:"
-#: ../src/gnome-nettool.glade.h:53
+#: ../data/gnome-nettool.ui.h:52
msgid "Packets transmitted:"
msgstr "ప���లాల� ప�రసరి�పబడినవి:"
-#: ../src/gnome-nettool.glade.h:54 ../src/main.c:290
+#: ../data/gnome-nettool.ui.h:53 ../src/main.c:290
msgid "Ping"
msgstr "పి���"
-#: ../src/gnome-nettool.glade.h:55
+#: ../data/gnome-nettool.ui.h:54
msgid "Port Scan"
-msgstr "ర�వ� స�శ�ధన"
+msgstr "ప�ర��� స�శ�ధన"
-#: ../src/gnome-nettool.glade.h:56
+#: ../data/gnome-nettool.ui.h:55
msgid "Port scan output"
msgstr "à°ªà±?à°°à±?à°?à±? à°¸à±?à°?ానà±? à°?à°µà±?à°?à±?â??à°ªà±?à°?à±?"
-#: ../src/gnome-nettool.glade.h:57
+#: ../data/gnome-nettool.ui.h:56
msgid "Received bytes:"
msgstr "త�స���నబడిన బ���స�:"
-#: ../src/gnome-nettool.glade.h:58
+#: ../data/gnome-nettool.ui.h:57
msgid "Received packets:"
msgstr "త�స���నబడిన ప���లాల�:"
-#: ../src/gnome-nettool.glade.h:59
+#: ../data/gnome-nettool.ui.h:58
msgid "Reception errors:"
msgstr "స�వ��రి��ిన ద�షాల�:"
-#: ../src/gnome-nettool.glade.h:60
+#: ../data/gnome-nettool.ui.h:59
msgid "Routing Table Information"
msgstr "త�ర�వ��ప� ప���ి� సమా�ారమ�"
-#: ../src/gnome-nettool.glade.h:61 ../src/main.c:619
+#: ../data/gnome-nettool.ui.h:60 ../src/main.c:619
msgid "Scan"
msgstr "స�శ�ధన"
-#: ../src/gnome-nettool.glade.h:62
+#: ../data/gnome-nettool.ui.h:61
msgid "Send:"
msgstr "ప�ప�:"
-#: ../src/gnome-nettool.glade.h:63
+#: ../data/gnome-nettool.ui.h:62
msgid "State:"
msgstr "స�థితి:"
-#: ../src/gnome-nettool.glade.h:64
+#: ../data/gnome-nettool.ui.h:63
msgid "Successful packets:"
msgstr "వి�యవ�తమ�న ప���లాల�:"
-#: ../src/gnome-nettool.glade.h:65 ../src/main.c:375
+#: ../data/gnome-nettool.ui.h:64 ../src/main.c:375
msgid "Trace"
msgstr "�ాడ"
-#: ../src/gnome-nettool.glade.h:66
+#: ../data/gnome-nettool.ui.h:65
msgid "Traceroute"
msgstr "�ాడ త�ర�వ వ�త���"
-#: ../src/gnome-nettool.glade.h:67
+#: ../data/gnome-nettool.ui.h:66
msgid "Traceroute output"
msgstr "à°?à±?à°°à±?à°¸à±?â??à°°à±?à°?à±? à°?à°µà±?à°?à±?â??à°ªà±?à°?à±?"
-#: ../src/gnome-nettool.glade.h:68
+#: ../data/gnome-nettool.ui.h:67
msgid "Transmission errors:"
msgstr "ప�రసరణ ద�షమ�:"
-#: ../src/gnome-nettool.glade.h:69
+#: ../data/gnome-nettool.ui.h:68
msgid "Transmitted bytes:"
msgstr "ప�రసరి��బడిన బ���స�:"
-#: ../src/gnome-nettool.glade.h:70
+#: ../data/gnome-nettool.ui.h:69
msgid "Transmitted packets:"
msgstr "ప�రసరి��బడిన ప���లాల�:"
-#: ../src/gnome-nettool.glade.h:71
+#: ../data/gnome-nettool.ui.h:70
msgid "Unlimited requests"
msgstr "హద�ద�ల�ల�ని మనవిల�"
-#: ../src/gnome-nettool.glade.h:72
+#: ../data/gnome-nettool.ui.h:71
msgid "User"
-msgstr "వినియ��దార�"
+msgstr "వాడ��రి"
-#: ../src/gnome-nettool.glade.h:73
+#: ../data/gnome-nettool.ui.h:72
msgid "User name"
-msgstr "వినియ��దారి నామమ�"
+msgstr "వాడ��రి ప�ర�"
-#: ../src/gnome-nettool.glade.h:74 ../src/main.c:920
+#: ../data/gnome-nettool.ui.h:73 ../src/main.c:920
msgid "Whois"
-msgstr "హ�యిస�"
+msgstr "Whois"
-#: ../src/gnome-nettool.glade.h:75
+#: ../data/gnome-nettool.ui.h:74
msgid "Whois output"
-msgstr "à°¹à±?à°?à°?à±? à°?à°µà±?à°?à±?â??à°ªà±?à°?à±?"
+msgstr "Whois à°?à°µà±?à°?à±?â??à°ªà±?à°?à±?"
-#: ../src/gnome-nettool.glade.h:76
+#: ../data/gnome-nettool.ui.h:75
msgid "_Configure"
-msgstr "_ర�ప�రణ"
+msgstr "���త��రణ (_C)"
-#: ../src/gnome-nettool.glade.h:77
+#: ../data/gnome-nettool.ui.h:76
msgid "_Domain address:"
-msgstr "_�ధి�ార��ష�త�ర �ిర�నామా:"
+msgstr "�ధి�ార��ష�త�ర �ిర�నామా (_D):"
-#: ../src/gnome-nettool.glade.h:78
+#: ../data/gnome-nettool.ui.h:77
msgid "_Edit"
-msgstr "_సరి��య�"
+msgstr "సరి��య� (_E)"
-#: ../src/gnome-nettool.glade.h:79
+#: ../data/gnome-nettool.ui.h:78
msgid "_Help"
-msgstr "_సహాయమ�"
+msgstr "సహాయమ� (_H)"
-#: ../src/gnome-nettool.glade.h:80
+#: ../data/gnome-nettool.ui.h:79
msgid "_Information type:"
-msgstr "_సమా�ార ర�మ�:"
+msgstr "సమా�ార ర�మ� (_I):"
-#: ../src/gnome-nettool.glade.h:81
+#: ../data/gnome-nettool.ui.h:80
msgid "_Network address:"
-msgstr "_�ల�లి� �ిర�నామా:"
+msgstr "న���వర��� �ిర�నామా (_N)"
-#: ../src/gnome-nettool.glade.h:82
+#: ../data/gnome-nettool.ui.h:81
msgid "_Network device:"
-msgstr "_�ల�లి� పరి�ర�:"
+msgstr "న���వర��� పరి�ర�: (_N)"
-#: ../src/gnome-nettool.glade.h:83
+#: ../data/gnome-nettool.ui.h:82
msgid "_Tool"
-msgstr "_పనిమ���ల�"
+msgstr "పనిమ���ల� (_T)"
-#: ../src/gnome-nettool.glade.h:84
+#: ../data/gnome-nettool.ui.h:83
msgid "_Username:"
-msgstr "_వినియ��దార� నామమ�:"
+msgstr "వాడ��రి ప�ర� (_U):"
-#. Translators: this is the abbreviation for milliseconds
-#: ../src/gnome-nettool.glade.h:86
+#: ../data/gnome-nettool.ui.h:84
msgid "ms"
msgstr "ms"
-#: ../src/gnome-nettool.glade.h:87
+#: ../data/gnome-nettool.ui.h:85
msgid "requests"
-msgstr "మనవిల�"
+msgstr "à°?à°à±?యరà±?ధనలà±?"
#. Interface Name Interface Type icon Device prefix Pixbuf
#: ../src/info.c:60
@@ -451,7 +489,7 @@ msgstr "à°¤à±?లియని à°¸à°?à°µà
#: ../src/info.c:165
msgid "Network Devices Not Found"
-msgstr "�ల�లి� పరి�రాల� ద�ర�ల�ద�"
+msgstr "న���వర��� పరి�రాల� ద�ర�ల�ద�"
#: ../src/info.c:392 ../src/info.c:395
msgid "Unknown"
@@ -481,7 +519,7 @@ msgstr "నిరà±?పయà±?à°?à°¿à°?à°
#: ../src/info.c:573
#, c-format
msgid "Network device:\t%s\n"
-msgstr "�ల�లి� పరి�ర�:\t%s\n"
+msgstr "న���వర��� పరి�ర�:\t%s\n"
#: ../src/info.c:574
#, c-format
@@ -544,7 +582,7 @@ msgstr "%s వ�త������"
#: ../src/lookup.c:274
msgid "Name"
-msgstr "నామమ�"
+msgstr "ప�ర�"
#. Time To Live of a hostname in a name server
#: ../src/lookup.c:283
@@ -573,64 +611,68 @@ msgstr "�ిర�నామా"
msgid "Source\tTTL\tAddress Type\tRecord Type1\tResolution\n"
msgstr "వనర�\t�ి�ియల�\t�ిర�నామా ర�మ�\tరి�ార�డ� ర�మ�1\tనిశ��యమ�\n"
-#: ../src/main.c:83
+#: ../src/main.c:82
msgid "Load information for a network device"
-msgstr "�ల�లి� పరి�రమ�ల ��ర�� సమా�ారమ�న� ని�ప�మ�"
+msgstr "న���వర��� పరి�రమ�ల ��ర�� సమా�ారమ�న� ని�ప�మ�"
-#: ../src/main.c:84
+#: ../src/main.c:83
msgid "DEVICE"
msgstr "పరి�ర�"
-#: ../src/main.c:87
+#: ../src/main.c:86
msgid "Send a ping to a network address"
-msgstr "�ల�లి� �ిర�నామా�� పి��� ప�ప�మ�"
+msgstr "న���వర��� �ిర�నామా�� పి��� ప�ప�మ�"
-#: ../src/main.c:88 ../src/main.c:96 ../src/main.c:100 ../src/main.c:104
+#: ../src/main.c:87 ../src/main.c:95 ../src/main.c:99 ../src/main.c:103
msgid "HOST"
msgstr "�తిథ�య�"
-#: ../src/main.c:91
+#: ../src/main.c:90
msgid "Get netstat information. Valid options are: route, active, multicast."
-msgstr "న��� స��ా�� సమా�ారమ�న� ప��ద�మ�. వర�తి��� ����ాప�ర�వ�మ�ల�: త�ర�వ, ��రియాశ�ల�, మల�����యాస���."
+msgstr ""
+"న��� స��ా�� సమా�ారమ�న� ప��ద�మ�. వర�తి��� ����ాప�ర�వ�మ�ల�: త�ర�వ, ��రియాశ�ల�, "
+"మల�����యాస���."
-#: ../src/main.c:92
+#: ../src/main.c:91
msgid "COMMAND"
msgstr "�ద�శమ�"
-#: ../src/main.c:95
+#: ../src/main.c:94
msgid "Trace a route to a network address"
-msgstr "�� �ల�లి� �ిర�నామా�� �ాడ త�ర�వ వ�త���"
+msgstr "�� న���వర��� �ిర�నామా�� �ాడ త�ర�వ వ�త���"
-#: ../src/main.c:99
+#: ../src/main.c:98
msgid "Port scan a network address"
-msgstr "�ల�లి� �ిర�నామా�� ర�వ� స�శ�ధి���"
+msgstr "న���వర��� �ిర�నామా�� ప�ర��� స�శ�ధి���"
-#: ../src/main.c:103
+#: ../src/main.c:102
msgid "Look up a network address"
-msgstr "�ల�లి� �ిర�నామా�� వ�త������"
+msgstr "న���వర��� �ిర�నామా�� వ�త������"
-#: ../src/main.c:107
+#: ../src/main.c:106
msgid "Finger command to run"
msgstr "పని��య���� వ�ర�ల� �ద�శ�"
-#: ../src/main.c:108
+#: ../src/main.c:107
msgid "USER"
-msgstr "వినియ��దార�"
+msgstr "వాడ��రి"
-#: ../src/main.c:111
+#: ../src/main.c:110
msgid "Perform a whois lookup for a network domain"
-msgstr "�� �ల�లి� �ధి�ార��ష�త�ర� ��ర�� హ�యిస� వ�త����న� ప�రదర�శి���"
+msgstr "�� న���వర��� �ధి�ార��ష�త�ర� ��ర�� హ�యిస� వ�త����న� ప�రదర�శి���"
-#: ../src/main.c:112
+#: ../src/main.c:111
msgid "DOMAIN"
msgstr "�థి�ార��ష�త�ర�"
-#: ../src/main.c:131
+#: ../src/main.c:130
#, c-format
msgid ""
"The file %s doesn't exist, please check if gnome-nettool is correctly "
"installed"
-msgstr "%s �లి�ి ల�ద�, దయ��సి ��వ�ళ ��న� మ�-న��� పనిమ����� సరియ�న విధ��ా న�ల��ల�పబడినదా తని����య�మ�"
+msgstr ""
+"%s �లి�ి ల�ద�, దయ��సి ��వ�ళ ��న� మ�-న��� పనిమ����� సరియ�న విధ��ా "
+"న�ల��ల�పబడినదా తని����య�మ�"
#: ../src/main.c:482 ../src/netstat.c:443
msgid "Protocol"
@@ -662,7 +704,7 @@ msgstr "à°?à°?à°?à°°à±?à°¨à±?à°?à±? à°?à
#: ../src/main.c:671
msgid "Canonical Name"
-msgstr "��న�ని�ల� నామమ�"
+msgstr "��న�ని�ల� ప�ర�"
#: ../src/main.c:672
msgid "CPU / OS Type"
@@ -684,7 +726,7 @@ msgstr "నామప� స�వి�"
#: ../src/main.c:678
msgid "Host name for Address"
-msgstr "�ిర�నామా ��ర�� �తిధ�య నామమ�"
+msgstr "�ిర�నామా ��ర�� �తిధ�య ప�ర�"
#: ../src/main.c:679
msgid "Start-of-authority"
@@ -720,7 +762,7 @@ msgstr "IP వనర�"
#: ../src/netstat.c:458
msgid "Port/Service"
-msgstr "ర�వ�/స�వ"
+msgstr "ప�ర���/స�వ"
#: ../src/netstat.c:466 ../src/scan.c:314
msgid "State"
@@ -736,11 +778,11 @@ msgstr "�మ�య�"
#: ../src/netstat.c:618
msgid "Gateway"
-msgstr "సి�హాద�వారమ�"
+msgstr "à°?à±?à°?à±?â??à°µà±?"
#: ../src/netstat.c:626
msgid "Netmask"
-msgstr "న��� మాస���"
+msgstr "à°¨à±?à°?à±?â??మాసà±?à°?à±?"
#: ../src/netstat.c:634 ../src/netstat.c:741
msgid "Interface"
@@ -759,14 +801,14 @@ msgstr "సమ�దాయ�"
#. It's a tabular output, and these belongs to the column titles
#: ../src/netstat.c:798
msgid "Protocol\tIP Source\tPort/Service\tState\n"
-msgstr "ప�ర����ాల�\tIP వనర�\tర�వ�/స�వ\tస�థితి\n"
+msgstr "ప�ర����ాల�\tIP వనర�\tప�ర���/స�వ\tస�థితి\n"
#. The netstat "Display routing" output in text format.
#. This seems as a route table.
#. It's a tabular output, and these belongs to the column titles
#: ../src/netstat.c:804
msgid "Destination\tGateway\tNetmask\tInterface\n"
-msgstr "�మ�య�\tసి�హాద�వారమ�\tన��� మాస���\tస�విధాన�\n"
+msgstr "à°?à°®à±?à°¯à°?\tà°?à±?à°?à±?â??à°µà±?\tà°¨à±?à°?à±? మాసà±?à°?à±?\tà°¸à°?విధానà°?\n"
#. The netstat "Multicast information" output in text format.
#. It's a tabular output, and these belongs to the column titles
@@ -776,11 +818,12 @@ msgstr "à°¸à°?విధానà°?\tà°¸à°
#: ../src/nettool.c:199
msgid "A network address was not specified"
-msgstr "�ల�లి� �ిర�నామా నిర�థ�శి��బడల�ద�"
+msgstr "న���వర��� �ిర�నామా నిర�థ�శి��బడల�ద�"
#: ../src/nettool.c:200 ../src/nettool.c:209
msgid "Please enter a valid network address and try again."
-msgstr "దయ��సి వర�తి��� �ల�లి� �ిర�నామాన� ��ర���మ� మరియ� మరలా ప�రయత�ని���మ�."
+msgstr ""
+"దయ��సి వర�తి��� న���వర��� �ిర�నామాన� ��ర���మ� మరియ� మరలా ప�రయత�ని���మ�."
#: ../src/nettool.c:207
#, c-format
@@ -793,17 +836,18 @@ msgstr "à°?ధిà°?ారà°?à±?à°·à±?à°
#: ../src/nettool.c:237
msgid "Please enter a valid domain address and try again."
-msgstr "దయ��సి వర�తి��� �ధి�ార��ష�త�ర �ిర�నామాన� ��ర���మ� మరియ� మరలా ప�రయత�ని���."
+msgstr ""
+"దయ��సి వర�తి��� �ధి�ార��ష�త�ర �ిర�నామాన� ��ర���మ� మరియ� మరలా ప�రయత�ని���."
-#: ../src/nettool.c:406
+#: ../src/nettool.c:428
msgid "Information not available"
msgstr "సమాà°?ారమà±? à°²à°à°¿à°?à°?à°²à±?à°¦à±?"
-#: ../src/nettool.c:526
+#: ../src/nettool.c:548
msgid "Stop"
msgstr "à°?à°?à±?"
-#: ../src/nettool.c:532
+#: ../src/nettool.c:554
msgid "Run"
msgstr "పర���"
@@ -883,7 +927,7 @@ msgstr "విà°?యవà°?తమà±?à°¨ à
#: ../src/scan.c:94
#, c-format
msgid "Scanning %s for open ports"
-msgstr "ర�వ�ల� త�ర���� ��ర�� %s స�శ�ధి���"
+msgstr "ప�ర���ల� త�ర���� ��ర�� %s స�శ�ధి���"
#: ../src/scan.c:169
msgid "unknown"
@@ -896,7 +940,7 @@ msgstr "త�ర�వ�మ�"
#: ../src/scan.c:306
msgid "Port"
-msgstr "ర�వ�"
+msgstr "ప�ర���"
#: ../src/scan.c:322
msgid "Service"
@@ -907,7 +951,7 @@ msgstr "స�వ"
#. It's a tabular output, and these belongs to the column titles
#: ../src/scan.c:344
msgid "Port\tState\tService\n"
-msgstr "ర�వ�\tస�థితి\tస�వ\n"
+msgstr "ప�ర���\tస�థితి\tస�వ\n"
#: ../src/traceroute.c:62
#, c-format
@@ -920,7 +964,7 @@ msgstr "హాప�"
#: ../src/traceroute.c:273
msgid "Hostname"
-msgstr "�తిథ�య నామమ�"
+msgstr "�తిథ�య ప�ర�"
#: ../src/traceroute.c:281
msgid "IP"
@@ -940,18 +984,16 @@ msgstr "సమయ� 2"
#. It's a tabular output, and these belongs to the column titles
#: ../src/traceroute.c:328
msgid "Hop\tHostname\tIP\tTime 1\tTime 2\n"
-msgstr "హప�\t�తిథ�య నామమ�\tIP\tసమయ� 1\tసమయ� 2\n"
+msgstr "హప�\t�తిథ�య ప�ర�\tIP\tసమయ� 1\tసమయ� 2\n"
#: ../src/utils.c:227
#, c-format
msgid ""
"In order to use this feature of the program, %s must be installed in your "
"system"
-msgstr "� �ార�య��రమ� య���� విశిష��తన� ��రమ�ల� వాడ�� ��ర��, మ� య���� వ�యవస�థల� �శ��ిత��ా %sన�ల��ల�పబడాలి"
-
-#: ../src/gnome-nettool.desktop.in.in.h:2
-msgid "View information about your network"
-msgstr "మ� య���� �ల�లి� ��రి��ి సమా�ారమ�న� దర�శి���మ�"
+msgstr ""
+"� �ార�య��రమ� య���� విశిష��తన� ��రమ�ల� వాడ�� ��ర��, మ� య���� వ�యవస�థల� "
+"�శ��ిత��ా %sన�ల��ల�పబడాలి"
#: ../src/finger.c:63
#, c-format
@@ -961,7 +1003,7 @@ msgstr "\"%s\" ప� %s సమా�ా
#: ../src/finger.c:67
#, c-format
msgid "Getting information of all users on \"%s\""
-msgstr "\"%s\" ప� ��దరి వినియ��దార�ల య���� సమా�ారమ� ప��ద�త�న�నది"
+msgstr "\"%s\" ప� ��దరి వాడ��రిల య���� సమా�ారమ� ప��ద�త�న�నది"
#: ../src/whois.c:58
#, c-format
diff -pruN 3.0.0-2/po/tr.po 3.0.1-0ubuntu1/po/tr.po
--- 3.0.0-2/po/tr.po 2010-12-02 09:26:14.000000000 +0000
+++ 3.0.1-0ubuntu1/po/tr.po 2012-01-03 09:10:16.000000000 +0000
@@ -4,132 +4,163 @@
#
# Onur Can Ã?AKMAK <onur cakmak gmail com>, 2006.
# Baris Cicek <baris teamforce name tr>, 2008, 2009.
+# Tunahan Uçar <tunahanucar gmail com>, 2011.
+#
msgid ""
msgstr ""
"Project-Id-Version: gnome-nettool.HEAD.tr\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-10 00:33+0300\n"
-"PO-Revision-Date: 2009-09-10 00:34+0300\n"
-"Last-Translator: Baris Cicek <baris teamforce name tr>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
+"nettool&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-06-15 08:42+0000\n"
+"PO-Revision-Date: 2011-06-22 14:28+0200\n"
+"Last-Translator: Tunahan Uçar <tunahanucar gmail com>\n"
"Language-Team: Turkish <gnome-turk gnome org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../src/callbacks.c:323
+#: ../src/callbacks.c:332
msgid "translator-credits"
msgstr "BarıÅ? Ã?içek <baris teamforce name tr>"
#. Translators: %s is the name of the copyright holder
-#: ../src/callbacks.c:330
+#: ../src/callbacks.c:339
#, c-format
msgid "Copyright © 2003-2008 %s"
msgstr "Telif Hakkı © 2003-2008 %s"
#. Dear translator: This is the name of the application
-#: ../src/callbacks.c:334 ../src/callbacks.c:335
-#: ../src/gnome-nettool.desktop.in.in.h:1
+#: ../src/callbacks.c:343 ../src/callbacks.c:344
+#: ../data/gnome-nettool.desktop.in.in.h:1
msgid "Network Tools"
msgstr "AÄ? Araçları"
-#: ../src/callbacks.c:337
+#: ../src/callbacks.c:346
msgid "Graphical user interface for common network utilities"
msgstr "Ortak aÄ? araçları için grafik kullanıcı arabirimi"
-#: ../src/callbacks.c:450 ../src/main.c:142 ../src/nettool.c:483
+#: ../src/callbacks.c:458 ../src/main.c:142 ../src/nettool.c:483
msgid "Idle"
msgstr "Atıl"
#. Dear Translator: This is the Window Title. 'Network Tools' is the
#. * name of the application
-#: ../src/callbacks.c:455
+#: ../src/callbacks.c:463
#, c-format
msgid "%s - Network Tools"
msgstr "%s - AÄ? Araçları"
-#: ../src/callbacks.c:479
+#: ../src/callbacks.c:487
msgid "Unable to open help file"
msgstr "Yardım dosyası açılamadı"
-#: ../src/gnome-nettool.ui.h:1
+#: ../data/gnome-nettool.desktop.in.in.h:2
+msgid "View information about your network"
+msgstr "AÄ?ınız hakkında bilgi görüntüleyin"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:1
+msgid "A list of domains previously used"
+msgstr "Ã?nceden kullanılmıÅ? alan adlarının listesi"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:2
+msgid "A list of hostnames previously used"
+msgstr "Ã?nceden kullanılmıÅ? makine adlarının listesi"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:3
+msgid "A list of usernames previously used"
+msgstr "Ã?nceden kullanılmıÅ? kullanıcı adlarının listesi"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:4
+msgid "Historically used domains"
+msgstr "GeçmiÅ?te kullanılmıÅ? alan adları"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:5
+msgid "Historically used hostnames"
+msgstr "GeçmiÅ?te kullanılmıÅ? makine adları"
+
+#: ../data/org.gnome.gnome-nettool.gschema.xml.in.h:6
+msgid "Historically used usernames"
+msgstr "GeçmiÅ?te kullanılmıÅ? kullanıcı adları"
+
+#: ../data/gnome-nettool.ui.h:1
msgid "0"
msgstr "0"
-#: ../src/gnome-nettool.ui.h:3
+#: ../data/gnome-nettool.ui.h:3
#, no-c-format
msgid "0%"
msgstr "%%0"
-#: ../src/gnome-nettool.ui.h:4
+#: ../data/gnome-nettool.ui.h:4
msgid "0.0"
msgstr "0.0"
-#: ../src/gnome-nettool.ui.h:5
+#: ../data/gnome-nettool.ui.h:5
msgid "<b>IP Information</b>"
msgstr "<b>IP Bilgisi</b>"
-#: ../src/gnome-nettool.ui.h:6
+#: ../data/gnome-nettool.ui.h:6
msgid "<b>Interface Information</b>"
msgstr "<b>Arabirim Bilgisi</b>"
-#: ../src/gnome-nettool.ui.h:7
+#: ../data/gnome-nettool.ui.h:7
msgid "<b>Interface Statistics</b>"
msgstr "<b>Arabirim Ä°statistikleri</b>"
-#: ../src/gnome-nettool.ui.h:8
+#: ../data/gnome-nettool.ui.h:8
msgid "<b>Round Trip Time Statistics</b>"
msgstr "<b>DolaÅ?ım Süresi Ä°statistikleri</b>"
-#: ../src/gnome-nettool.ui.h:9
+#: ../data/gnome-nettool.ui.h:9
msgid "<b>Transmission Statistics</b>"
msgstr "<b>Ä°letim Ä°statistikleri</b>"
-#: ../src/gnome-nettool.ui.h:10
+#: ../data/gnome-nettool.ui.h:10
msgid "Active Network Services"
msgstr "Etkin AÄ? Servisleri"
-#: ../src/gnome-nettool.ui.h:11
+#: ../data/gnome-nettool.ui.h:11
msgid "Average:"
msgstr "Ortalama:"
-#: ../src/gnome-nettool.ui.h:12
+#: ../data/gnome-nettool.ui.h:12
msgid "Beep on ping"
msgstr "Pingde biple"
-#: ../src/gnome-nettool.ui.h:13
+#: ../data/gnome-nettool.ui.h:13
msgid "Clear _History"
msgstr "GeçmiÅ?i _Temizle"
-#: ../src/gnome-nettool.ui.h:14
+#: ../data/gnome-nettool.ui.h:14
msgid "Collisions:"
msgstr "Ã?akıÅ?malar:"
-#: ../src/gnome-nettool.ui.h:15
+#: ../data/gnome-nettool.ui.h:15
msgid "Copy as text _report"
msgstr "Metin _raporu olarak kopyala"
-#: ../src/gnome-nettool.ui.h:16
+#: ../data/gnome-nettool.ui.h:16
msgid "Details"
msgstr "Ayrıntılar"
-#: ../src/gnome-nettool.ui.h:17
+#: ../data/gnome-nettool.ui.h:17
msgid "Devices"
msgstr "Aygıtlar"
-#: ../src/gnome-nettool.ui.h:18
+#: ../data/gnome-nettool.ui.h:18
msgid "Devices - Network Tools"
msgstr "Aygıtlar - AÄ? Araçları"
-#: ../src/gnome-nettool.ui.h:19
+#: ../data/gnome-nettool.ui.h:19
msgid "Display:"
msgstr "Görüntü:"
-#: ../src/gnome-nettool.ui.h:20
+#: ../data/gnome-nettool.ui.h:20
msgid "Domain address"
msgstr "Alan adresi"
-#: ../src/gnome-nettool.ui.h:21
+#: ../data/gnome-nettool.ui.h:21
msgid ""
"Enter a domain address to lookup its whois information. For example: www."
"domain.com or 192.168.2.1"
@@ -137,7 +168,7 @@ msgstr ""
"Whois bilgisi aranacak alanı girin. Ã?rneÄ?in: www.domain.com.tr veya "
"192.168.2.1"
-#: ../src/gnome-nettool.ui.h:22
+#: ../data/gnome-nettool.ui.h:22
msgid ""
"Enter the network address to finger that user. For example: www.domain.com "
"or 192.168.2.1"
@@ -145,20 +176,20 @@ msgstr ""
"Kullanıcı bilgisinin sorgulanacaÄ?ı aÄ? adresini girin. Ã?rneÄ?in: auth.alan.com."
"tr veya 192.168.2.1"
-#: ../src/gnome-nettool.ui.h:23
+#: ../data/gnome-nettool.ui.h:23
msgid ""
"Enter the network address to lookup. For example: www.domain.com or "
"192.168.2.1"
msgstr ""
"Ã?özümlenecek aÄ? adresini girin. Ã?rneÄ?in: www.domain.com.tr veya 192.168.2.1"
-#: ../src/gnome-nettool.ui.h:24
+#: ../data/gnome-nettool.ui.h:24
msgid ""
"Enter the network address to ping. For example: www.domain.com or 192.168.2.1"
msgstr ""
"Ping atılacak aÄ? adresini girin. Ã?rneÄ?in: www.domain.com.tr veya 192.168.2.1"
-#: ../src/gnome-nettool.ui.h:25
+#: ../data/gnome-nettool.ui.h:25
msgid ""
"Enter the network address to scan for open ports. For example: www.domain."
"com or 192.168.2.1"
@@ -166,7 +197,7 @@ msgstr ""
"Açık portların taranacaÄ?ı aÄ? adresini girin. Ã?rneÄ?in: www.domain.com.tr veya "
"192.168.2.1"
-#: ../src/gnome-nettool.ui.h:26
+#: ../data/gnome-nettool.ui.h:26
msgid ""
"Enter the network address to trace a route to. For example: www.domain.com "
"or 192.168.2.1"
@@ -174,239 +205,239 @@ msgstr ""
"Giden yolun izleneceÄ?i aÄ? adresini girin. Ã?rneÄ?in: www.domain.com.tr veya "
"192.168.2.1"
-#: ../src/gnome-nettool.ui.h:27
+#: ../data/gnome-nettool.ui.h:27
msgid "Enter the user to finger"
msgstr "Finger yapılacak kullanıcıyı girin"
-#: ../src/gnome-nettool.ui.h:28 ../src/main.c:814
+#: ../data/gnome-nettool.ui.h:28 ../src/main.c:812
msgid "Finger"
msgstr "Finger"
-#: ../src/gnome-nettool.ui.h:29
+#: ../data/gnome-nettool.ui.h:29
msgid "Finger output"
msgstr "Finger çıktısı"
-#: ../src/gnome-nettool.ui.h:30
+#: ../data/gnome-nettool.ui.h:30
msgid "Hardware address:"
msgstr "Donanım adresi:"
-#: ../src/gnome-nettool.ui.h:31
+#: ../data/gnome-nettool.ui.h:31
msgid "Host"
msgstr "Makine"
-#: ../src/gnome-nettool.ui.h:32
+#: ../data/gnome-nettool.ui.h:32
msgid "Link speed:"
msgstr "BaÄ?lantı hızı:"
-#: ../src/gnome-nettool.ui.h:33 ../src/main.c:734
+#: ../data/gnome-nettool.ui.h:33 ../src/main.c:732
msgid "Lookup"
msgstr "Ara"
-#: ../src/gnome-nettool.ui.h:34
+#: ../data/gnome-nettool.ui.h:34
msgid "Lookup output"
msgstr "Lookup çıktısı"
-#: ../src/gnome-nettool.ui.h:35
+#: ../data/gnome-nettool.ui.h:35
msgid "MTU:"
msgstr "MTU:"
-#: ../src/gnome-nettool.ui.h:36
+#: ../data/gnome-nettool.ui.h:36
msgid "Maximum:"
msgstr "Maksimum:"
-#: ../src/gnome-nettool.ui.h:37
+#: ../data/gnome-nettool.ui.h:37
msgid "Minimum:"
msgstr "Minimum:"
-#: ../src/gnome-nettool.ui.h:38
+#: ../data/gnome-nettool.ui.h:38
msgid "Multicast Information"
msgstr "�oklu Yayın Bilgisi"
-#: ../src/gnome-nettool.ui.h:39
+#: ../data/gnome-nettool.ui.h:39
msgid "Multicast:"
msgstr "�oklu Yayın:"
-#: ../src/gnome-nettool.ui.h:40 ../src/main.c:446
+#: ../data/gnome-nettool.ui.h:40 ../src/main.c:446
msgid "Netstat"
msgstr "AÄ? Durumu"
-#: ../src/gnome-nettool.ui.h:41
+#: ../data/gnome-nettool.ui.h:41
msgid "Netstat output"
msgstr "Netstat çıktısı"
-#: ../src/gnome-nettool.ui.h:42
+#: ../data/gnome-nettool.ui.h:42
msgid "Network address"
msgstr "AÄ? adresi"
-#: ../src/gnome-nettool.ui.h:43
+#: ../data/gnome-nettool.ui.h:43
msgid "Not Available"
msgstr "Mevcut DeÄ?il"
-#: ../src/gnome-nettool.ui.h:44
+#: ../data/gnome-nettool.ui.h:44
msgid "Only"
msgstr "Yalnız"
-#: ../src/gnome-nettool.ui.h:45
+#: ../data/gnome-nettool.ui.h:45
msgid "Output for finger"
msgstr "Finger için çıktı"
-#: ../src/gnome-nettool.ui.h:46
+#: ../data/gnome-nettool.ui.h:46
msgid "Output for lookup"
msgstr "Lookup için çıktı"
-#: ../src/gnome-nettool.ui.h:47
+#: ../data/gnome-nettool.ui.h:47
msgid "Output for net stat"
msgstr "Net stat için çıktı"
-#: ../src/gnome-nettool.ui.h:48
+#: ../data/gnome-nettool.ui.h:48
msgid "Output for port scan"
msgstr "Port taraması için çıktı"
-#: ../src/gnome-nettool.ui.h:49
+#: ../data/gnome-nettool.ui.h:49
msgid "Output for traceroute"
msgstr "Traceroute için çıktı"
-#: ../src/gnome-nettool.ui.h:50
+#: ../data/gnome-nettool.ui.h:50
msgid "Output for whois"
msgstr "Whois için çıktı"
-#: ../src/gnome-nettool.ui.h:51
+#: ../data/gnome-nettool.ui.h:51
msgid "Packets received:"
msgstr "Alınan paket:"
-#: ../src/gnome-nettool.ui.h:52
+#: ../data/gnome-nettool.ui.h:52
msgid "Packets transmitted:"
msgstr "Ä°letilen paket:"
-#: ../src/gnome-nettool.ui.h:53 ../src/main.c:290
+#: ../data/gnome-nettool.ui.h:53 ../src/main.c:290
msgid "Ping"
msgstr "Ping"
-#: ../src/gnome-nettool.ui.h:54
+#: ../data/gnome-nettool.ui.h:54
msgid "Port Scan"
msgstr "Port Tarama"
-#: ../src/gnome-nettool.ui.h:55
+#: ../data/gnome-nettool.ui.h:55
msgid "Port scan output"
msgstr "Port tarama çıktısı"
-#: ../src/gnome-nettool.ui.h:56
+#: ../data/gnome-nettool.ui.h:56
msgid "Received bytes:"
msgstr "Alınan bayt:"
-#: ../src/gnome-nettool.ui.h:57
+#: ../data/gnome-nettool.ui.h:57
msgid "Received packets:"
msgstr "Alınan paket:"
-#: ../src/gnome-nettool.ui.h:58
+#: ../data/gnome-nettool.ui.h:58
msgid "Reception errors:"
msgstr "Alım hataları:"
-#: ../src/gnome-nettool.ui.h:59
+#: ../data/gnome-nettool.ui.h:59
msgid "Routing Table Information"
msgstr "Yönlendirme Tablosu Bilgisi"
-#: ../src/gnome-nettool.ui.h:60 ../src/main.c:619
+#: ../data/gnome-nettool.ui.h:60 ../src/main.c:617
msgid "Scan"
msgstr "Tara"
-#: ../src/gnome-nettool.ui.h:61
+#: ../data/gnome-nettool.ui.h:61
msgid "Send:"
msgstr "Gönder:"
-#: ../src/gnome-nettool.ui.h:62
+#: ../data/gnome-nettool.ui.h:62
msgid "State:"
msgstr "Durum:"
-#: ../src/gnome-nettool.ui.h:63
+#: ../data/gnome-nettool.ui.h:63
msgid "Successful packets:"
msgstr "BaÅ?arılı paketler:"
-#: ../src/gnome-nettool.ui.h:64 ../src/main.c:375
+#: ../data/gnome-nettool.ui.h:64 ../src/main.c:375
msgid "Trace"
msgstr "Ä°zle"
-#: ../src/gnome-nettool.ui.h:65
+#: ../data/gnome-nettool.ui.h:65
msgid "Traceroute"
msgstr "Traceroute"
-#: ../src/gnome-nettool.ui.h:66
+#: ../data/gnome-nettool.ui.h:66
msgid "Traceroute output"
msgstr "Traceroute çıktısı"
-#: ../src/gnome-nettool.ui.h:67
+#: ../data/gnome-nettool.ui.h:67
msgid "Transmission errors:"
msgstr "İletim hataları:"
-#: ../src/gnome-nettool.ui.h:68
+#: ../data/gnome-nettool.ui.h:68
msgid "Transmitted bytes:"
msgstr "Ä°letilen veri (bayt):"
-#: ../src/gnome-nettool.ui.h:69
+#: ../data/gnome-nettool.ui.h:69
msgid "Transmitted packets:"
msgstr "Ä°letilen paketler:"
-#: ../src/gnome-nettool.ui.h:70
+#: ../data/gnome-nettool.ui.h:70
msgid "Unlimited requests"
msgstr "Sınırsız istekler"
-#: ../src/gnome-nettool.ui.h:71
+#: ../data/gnome-nettool.ui.h:71
msgid "User"
msgstr "Kullanıcı"
-#: ../src/gnome-nettool.ui.h:72
+#: ../data/gnome-nettool.ui.h:72
msgid "User name"
msgstr "Kullanıcı adı"
-#: ../src/gnome-nettool.ui.h:73 ../src/main.c:920
+#: ../data/gnome-nettool.ui.h:73 ../src/main.c:918
msgid "Whois"
msgstr "Whois"
-#: ../src/gnome-nettool.ui.h:74
+#: ../data/gnome-nettool.ui.h:74
msgid "Whois output"
msgstr "Whois çıktısı"
-#: ../src/gnome-nettool.ui.h:75
+#: ../data/gnome-nettool.ui.h:75
msgid "_Configure"
msgstr "_Ayarla"
-#: ../src/gnome-nettool.ui.h:76
+#: ../data/gnome-nettool.ui.h:76
msgid "_Domain address:"
msgstr "_Alan adresi:"
-#: ../src/gnome-nettool.ui.h:77
+#: ../data/gnome-nettool.ui.h:77
msgid "_Edit"
msgstr "_Düzenle"
-#: ../src/gnome-nettool.ui.h:78
+#: ../data/gnome-nettool.ui.h:78
msgid "_Help"
msgstr "_Yardım"
-#: ../src/gnome-nettool.ui.h:79
+#: ../data/gnome-nettool.ui.h:79
msgid "_Information type:"
msgstr "_Bilgi türü:"
-#: ../src/gnome-nettool.ui.h:80
+#: ../data/gnome-nettool.ui.h:80
msgid "_Network address:"
msgstr "_AÄ? adresi:"
-#: ../src/gnome-nettool.ui.h:81
+#: ../data/gnome-nettool.ui.h:81
msgid "_Network device:"
msgstr "_AÄ? aygıtı:"
-#: ../src/gnome-nettool.ui.h:82
+#: ../data/gnome-nettool.ui.h:82
msgid "_Tool"
msgstr "_Araç"
-#: ../src/gnome-nettool.ui.h:83
+#: ../data/gnome-nettool.ui.h:83
msgid "_Username:"
msgstr "_Kullanıcı adı:"
-#: ../src/gnome-nettool.ui.h:84
+#: ../data/gnome-nettool.ui.h:84
msgid "ms"
msgstr "ms"
-#: ../src/gnome-nettool.ui.h:85
+#: ../data/gnome-nettool.ui.h:85
msgid "requests"
msgstr "istek"
@@ -447,82 +478,82 @@ msgstr "Bilinmeyen Arabirim"
msgid "Network Devices Not Found"
msgstr "AÄ? Aygıtları Bulunamadı"
-#: ../src/info.c:392 ../src/info.c:395
+#: ../src/info.c:400 ../src/info.c:403
msgid "Unknown"
msgstr "Bilinmiyor"
-#: ../src/info.c:466
+#: ../src/info.c:474
msgid "Active"
msgstr "Aktif"
-#: ../src/info.c:468
+#: ../src/info.c:476
msgid "Inactive"
msgstr "Aktif DeÄ?il"
-#: ../src/info.c:473
+#: ../src/info.c:481
msgid "Loopback"
msgstr "Loopback"
-#: ../src/info.c:482
+#: ../src/info.c:490
msgid "Enabled"
msgstr "Etkin"
-#: ../src/info.c:484
+#: ../src/info.c:492
msgid "Disabled"
msgstr "Etkin DeÄ?il"
#. The info output in a text format (to copy on clipboard)
-#: ../src/info.c:573
+#: ../src/info.c:581
#, c-format
msgid "Network device:\t%s\n"
msgstr "AÄ? aygıtı:\t%s\n"
-#: ../src/info.c:574
+#: ../src/info.c:582
#, c-format
msgid "Hardware address:\t%s\n"
msgstr "Donanım adresi:\t%s\n"
-#: ../src/info.c:575
+#: ../src/info.c:583
#, c-format
msgid "Multicast:\t%s\n"
msgstr "�oklu yayın:\t%s\n"
-#: ../src/info.c:576
+#: ../src/info.c:584
#, c-format
msgid "MTU:\t%s\n"
msgstr "MTU:\t%s\n"
-#: ../src/info.c:577
+#: ../src/info.c:585
#, c-format
msgid "Link speed:\t%s\n"
msgstr "BaÄ?lantı hızı:\t%s\n"
-#: ../src/info.c:578
+#: ../src/info.c:586
#, c-format
msgid "State:\t%s\n"
msgstr "Durum:\t%s\n"
-#: ../src/info.c:580
+#: ../src/info.c:588
#, c-format
msgid "Transmitted packets:\t%s\n"
msgstr "Ä°letilen paketler:\t%s\n"
-#: ../src/info.c:581
+#: ../src/info.c:589
#, c-format
msgid "Transmission errors:\t%s\n"
msgstr "İletim hataları:\t%s\n"
-#: ../src/info.c:582
+#: ../src/info.c:590
#, c-format
msgid "Received packets:\t%s\n"
msgstr "Alınan paketler:\t%s\n"
-#: ../src/info.c:583
+#: ../src/info.c:591
#, c-format
msgid "Reception errors:\t%s\n"
msgstr "Alım hataları:\t%s\n"
-#: ../src/info.c:584
+#: ../src/info.c:592
#, c-format
msgid "Collisions:\t%s\n"
msgstr "Ã?akıÅ?malar:\t%s\n"
@@ -531,29 +562,29 @@ msgstr "Ã?akıÅ?malar:\t%s\n"
msgid "not available"
msgstr "mevcut deÄ?il"
-#: ../src/lookup.c:80
+#: ../src/lookup.c:81
#, c-format
msgid "Looking up %s"
msgstr "%s çözümleniyor"
-#: ../src/lookup.c:274
+#: ../src/lookup.c:275
msgid "Name"
msgstr "Ad"
#. Time To Live of a hostname in a name server
-#: ../src/lookup.c:283
+#: ../src/lookup.c:284
msgid "TTL"
msgstr "TTL"
-#: ../src/lookup.c:292
+#: ../src/lookup.c:293
msgid "Address Type"
msgstr "Adres Tipi"
-#: ../src/lookup.c:302
+#: ../src/lookup.c:303
msgid "Record Type"
msgstr "Kayıt Tipi"
-#: ../src/lookup.c:311
+#: ../src/lookup.c:312
msgid "Address"
msgstr "Adres"
@@ -563,7 +594,7 @@ msgstr "Adres"
#. Record Type (A, PTR, HINFO, NS, TXT, etc.),
#. Resolution (results of the query)
#. It's a tabular output, and these belongs to the column titles
-#: ../src/lookup.c:339
+#: ../src/lookup.c:340
msgid "Source\tTTL\tAddress Type\tRecord Type1\tResolution\n"
msgstr "Kaynak\tTTL\tAdres Tipi\tKayıt Tipi1\tSonuç\n"
@@ -648,53 +679,53 @@ msgstr "Yayın"
msgid "Scope"
msgstr "Kapsam"
-#: ../src/main.c:669
+#: ../src/main.c:667
msgid "Default Information"
msgstr "�ntanımlı Bilgi"
-#: ../src/main.c:670
+#: ../src/main.c:668
msgid "Internet Address"
msgstr "Ä°nternet Adresi"
-#: ../src/main.c:671
+#: ../src/main.c:669
msgid "Canonical Name"
msgstr "EÅ?lenik Ä°sim"
-#: ../src/main.c:672
+#: ../src/main.c:670
msgid "CPU / OS Type"
msgstr "MİB / OS Türü"
#. When asking for MX record in DNS context
-#: ../src/main.c:674
+#: ../src/main.c:672
msgid "Mailbox Exchange"
msgstr "Posta Kutusu DeÄ?iÅ? TokuÅ?"
-#: ../src/main.c:675
+#: ../src/main.c:673
msgid "Mailbox Information"
msgstr "Posta Kutusu Bilgisi"
#. When asking for NS record in DNS context
-#: ../src/main.c:677
+#: ../src/main.c:675
msgid "Name Server"
msgstr "Ä°sim Sunucusu"
-#: ../src/main.c:678
+#: ../src/main.c:676
msgid "Host name for Address"
msgstr "Adres İçin Makine İsmi"
-#: ../src/main.c:679
+#: ../src/main.c:677
msgid "Start-of-authority"
msgstr "Start-of-authority"
-#: ../src/main.c:680
+#: ../src/main.c:678
msgid "Text Information"
msgstr "Metin Bilgisi"
-#: ../src/main.c:681
+#: ../src/main.c:679
msgid "Well Known Services"
msgstr "Ä°yi Bilinen Servisler"
-#: ../src/main.c:682
+#: ../src/main.c:680
msgid "Any / All Information"
msgstr "Bazı / Hepsi Bilgi"
@@ -722,51 +753,51 @@ msgstr "Port/Servis"
msgid "State"
msgstr "Durum"
-#: ../src/netstat.c:609
+#: ../src/netstat.c:620
msgid "Destination/Prefix"
msgstr "Hedef/Ã?n ek"
-#: ../src/netstat.c:611
+#: ../src/netstat.c:622
msgid "Destination"
msgstr "Hedef"
-#: ../src/netstat.c:618
+#: ../src/netstat.c:629
msgid "Gateway"
msgstr "Geçit"
-#: ../src/netstat.c:626
+#: ../src/netstat.c:637
msgid "Netmask"
msgstr "AÄ? maskesi"
-#: ../src/netstat.c:634 ../src/netstat.c:741
+#: ../src/netstat.c:645 ../src/netstat.c:752
msgid "Interface"
msgstr "Arabirim"
-#: ../src/netstat.c:748
+#: ../src/netstat.c:759
msgid "Member"
msgstr "Ã?ye"
-#: ../src/netstat.c:756
+#: ../src/netstat.c:767
msgid "Group"
msgstr "Grup"
#. The netstat "Display active network services" output in
#. text format.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/netstat.c:798
+#: ../src/netstat.c:809
msgid "Protocol\tIP Source\tPort/Service\tState\n"
msgstr "Protokol\tKaynak IP\tPort/Servis\tDurum\n"
#. The netstat "Display routing" output in text format.
#. This seems as a route table.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/netstat.c:804
+#: ../src/netstat.c:815
msgid "Destination\tGateway\tNetmask\tInterface\n"
msgstr "Hedef\t\tGeçit\tAÄ? Maskesi\tArabirim\n"
#. The netstat "Multicast information" output in text format.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/netstat.c:809
+#: ../src/netstat.c:820
msgid "Interface\tMember\tGroup\n"
msgstr "Arabirim\tÃ?ye\tGrup\n"
@@ -808,32 +839,32 @@ msgstr "Ã?alıÅ?tır"
msgid "Time (ms):"
msgstr "Zaman (ms):"
-#: ../src/ping.c:171
+#: ../src/ping.c:172
msgid "Seq. No.:"
msgstr "Seq. No.:"
-#: ../src/ping.c:254
+#: ../src/ping.c:257
#, c-format
msgid "Sending ping requests to %s"
msgstr "%s adresine ping isteÄ?i gönderiliyor"
-#: ../src/ping.c:569
+#: ../src/ping.c:572
msgid "Bytes"
msgstr "Bayt"
-#: ../src/ping.c:576
+#: ../src/ping.c:579
msgid "Source"
msgstr "Kaynak"
-#: ../src/ping.c:584
+#: ../src/ping.c:587
msgid "Seq"
msgstr "Seq"
-#: ../src/ping.c:594
+#: ../src/ping.c:597
msgid "Time"
msgstr "Zaman"
-#: ../src/ping.c:602
+#: ../src/ping.c:605
msgid "Units"
msgstr "Birim"
@@ -841,37 +872,37 @@ msgstr "Birim"
#. Bytes received, Address Source, Number of Sequence,
#. Round Trip Time (Time), Units of Time.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/ping.c:628
+#: ../src/ping.c:631
msgid "Bytes\tSource\tSeq\tTime\tUnits\n"
msgstr "Bayt\tKaynak\tSeq\tZaman\tBirim\n"
#. The ping output in a text format (to copy on clipboard)
-#: ../src/ping.c:643
+#: ../src/ping.c:646
#, c-format
msgid "Time minimum:\t%s ms\n"
msgstr "Minimum zaman:\t%s ms\n"
-#: ../src/ping.c:644
+#: ../src/ping.c:647
#, c-format
msgid "Time average:\t%s ms\n"
msgstr "Ortalama zaman:\t%s ms\n"
-#: ../src/ping.c:645
+#: ../src/ping.c:648
#, c-format
msgid "Time maximum:\t%s ms\n"
msgstr "Maksimum zaman:\t%s ms\n"
-#: ../src/ping.c:647
+#: ../src/ping.c:650
#, c-format
msgid "Packets transmitted:\t%s\n"
msgstr "Gönderilen paketler:\t%s\n"
-#: ../src/ping.c:649
+#: ../src/ping.c:652
#, c-format
msgid "Packets received:\t%s\n"
msgstr "Alınan paketler:\t%s\n"
-#: ../src/ping.c:652
+#: ../src/ping.c:655
#, c-format
msgid "Successful packets:\t%s\n"
msgstr "BaÅ?arılı paketler:\t%s\n"
@@ -945,10 +976,6 @@ msgid ""
"system"
msgstr "Bu programı kullanabilmek için, sisteminizde %s kurulu olmalıdır"
-#: ../src/gnome-nettool.desktop.in.in.h:2
-msgid "View information about your network"
-msgstr "AÄ?ınız hakkında bilgi görüntüleyin"
-
#: ../src/finger.c:63
#, c-format
msgid "Getting information of %s on \"%s\""
diff -pruN 3.0.0-2/src/finger.c 3.0.1-0ubuntu1/src/finger.c
--- 3.0.0-2/src/finger.c 2010-12-02 09:26:14.000000000 +0000
+++ 3.0.1-0ubuntu1/src/finger.c 2012-01-03 09:10:16.000000000 +0000
@@ -18,6 +18,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <string.h>
#include <gtk/gtk.h>
@@ -43,7 +47,6 @@ finger_do (Netinfo * netinfo)
const gchar *user = NULL;
gchar *command = NULL;
gchar *program = NULL;
- gchar *program_name = NULL;
GtkWidget *parent;
gchar **command_line;
@@ -60,8 +63,8 @@ finger_do (Netinfo * netinfo)
if (g_ascii_strcasecmp (user, "") != 0)
netinfo->stbar_text =
- g_strdup_printf (_("Getting information of %s on \"%s\""), user,
- g_ascii_strcasecmp (host, "") != 0 ? host : "localhost");
+ g_strdup_printf (_("Getting information of %s on \"%s\""), user,
+ g_ascii_strcasecmp (host, "") != 0 ? host : "localhost");
else
netinfo->stbar_text =
g_strdup_printf (_("Getting information of all users on \"%s\""),
@@ -79,14 +82,11 @@ finger_do (Netinfo * netinfo)
gtk_text_buffer_delete (buffer, &start, &end);
parent = gtk_widget_get_toplevel (netinfo->output);
-
- program = util_find_program_in_path ("pinky", NULL);
- if (program != NULL) {
- program_name = g_strdup ("pinky");
- } else {
- program = util_find_program_dialog ("finger", parent);
- program_name = g_strdup ("finger");
+ program = util_find_program_in_path ("finger", NULL);
+
+ if (program == NULL) {
+ program = util_find_program_dialog ("pinky", NULL);
}
if (program != NULL) {
@@ -103,7 +103,7 @@ finger_do (Netinfo * netinfo)
} else if (! user_is_set && host_is_set) {
command_arg = g_strdup_printf ("@%s", host);
}
-
+
num_terms = 3;
if (command_arg != NULL)
num_terms++;
@@ -116,7 +116,7 @@ finger_do (Netinfo * netinfo)
command_line = g_new (gchar *, num_terms + 1);
i = 0;
command_line[i++] = g_strdup (program);
- command_line[i++] = g_strdup (program_name);
+ command_line[i++] = g_strdup (program);
if (command_options != NULL) {
for (j = 0; command_options[j] != NULL; j++)
command_line[i++] = g_strdup (command_options[j]);
@@ -147,7 +147,7 @@ finger_foreach (Netinfo * netinfo, gchar
gsize bytes_written;
GtkTextBuffer *buffer = NULL;
GtkTextIter iter;
-
+
g_return_if_fail (netinfo != NULL);
g_return_if_fail (line != NULL);
diff -pruN 3.0.0-2/src/finger.h 3.0.1-0ubuntu1/src/finger.h
--- 3.0.0-2/src/finger.h 2010-12-02 09:26:14.000000000 +0000
+++ 3.0.1-0ubuntu1/src/finger.h 2011-12-31 23:54:24.000000000 +0000
@@ -18,9 +18,6 @@
*/
#include <glib.h>
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
#include "nettool.h"
diff -pruN 3.0.0-2/src/gn-combo-history.c 3.0.1-0ubuntu1/src/gn-combo-history.c
--- 3.0.0-2/src/gn-combo-history.c 2011-01-11 10:32:42.000000000 +0000
+++ 3.0.1-0ubuntu1/src/gn-combo-history.c 2012-01-03 09:10:16.000000000 +0000
@@ -17,6 +17,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <gtk/gtk.h>
#include "gn-combo-history.h"
diff -pruN 3.0.0-2/src/info.c 3.0.1-0ubuntu1/src/info.c
--- 3.0.0-2/src/info.c 2012-02-16 05:03:13.000000000 +0000
+++ 3.0.1-0ubuntu1/src/info.c 2012-01-03 09:10:16.000000000 +0000
@@ -200,13 +200,11 @@ info_load_iface (Netinfo *info)
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (info->combo), renderer, TRUE);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (info->combo), renderer,
"pixbuf", 0, NULL);
- /* g_object_unref (renderer); */
renderer = gtk_cell_renderer_text_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (info->combo), renderer, TRUE);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (info->combo), renderer,
"markup", 1, NULL);
- /* g_object_unref (renderer); */
gtk_combo_box_set_active (GTK_COMBO_BOX (info->combo), 0);
}
@@ -354,7 +352,7 @@ info_get_nic_information (const gchar *n
{
GtkTreeModel *model;
GtkTreeIter iter;
- gchar dst[INFO_ADDRSTRLEN];
+ gchar *dst;
InfoIpAddr *ip;
gint prefix;
struct in_addr addr, subnet;
@@ -449,7 +447,7 @@ info_get_nic_information (const gchar *n
/* Get the Hardware Address */
if (netload.flags & (1L << GLIBTOP_NETLOAD_HWADDRESS)) {
- g_sprintf (dst, "%02x:%02x:%02x:%02x:%02x:%02x",
+ dst = g_strdup_printf ("%02x:%02x:%02x:%02x:%02x:%02x",
(int) ((guchar *) &netload.hwaddress)[0],
(int) ((guchar *) &netload.hwaddress)[1],
(int) ((guchar *) &netload.hwaddress)[2],
@@ -457,14 +455,15 @@ info_get_nic_information (const gchar *n
(int) ((guchar *) &netload.hwaddress)[4],
(int) ((guchar *) &netload.hwaddress)[5]);
} else {
- g_sprintf (dst, NOT_AVAILABLE);
+ dst = g_strdup_printf ("%s", NOT_AVAILABLE);
}
gtk_label_set_text (GTK_LABEL (info->hw_address), dst);
+ g_free (dst);
/* Get the interface's Maximum Transfer Unit */
- g_sprintf (dst, "%d", netload.mtu);
+ dst = g_strdup_printf ("%d", netload.mtu);
gtk_label_set_text (GTK_LABEL (info->mtu), dst);
- bzero (dst, strlen(dst));
+ g_free (dst);
/* Get Flags to determine other properties */
@@ -478,7 +477,9 @@ info_get_nic_information (const gchar *n
/* Is this a loopback device? */
if (netload.if_flags & (1L << GLIBTOP_IF_FLAGS_LOOPBACK)) {
- gtk_label_set_text (GTK_LABEL (info->hw_address), _("Loopback"));
+ dst = g_strdup_printf ("%s", _("Loopback"));
+ gtk_label_set_text (GTK_LABEL (info->hw_address), dst);
+ g_free (dst);
ip->ip_bcast = g_strdup ("");
info_setup_configure_button (info, FALSE);
} else {
diff -pruN 3.0.0-2/src/info.h 3.0.1-0ubuntu1/src/info.h
--- 3.0.0-2/src/info.h 2010-12-02 09:26:14.000000000 +0000
+++ 3.0.1-0ubuntu1/src/info.h 2012-01-02 00:13:52.000000000 +0000
@@ -17,13 +17,9 @@
*/
#include <glib.h>
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
#include "nettool.h"
-#define INFO_ADDRSTRLEN 128
#define NOT_AVAILABLE _("not available")
#define DELAY_STATS 1000 /* 1 second */
diff -pruN 3.0.0-2/src/lookup.c 3.0.1-0ubuntu1/src/lookup.c
--- 3.0.0-2/src/lookup.c 2010-12-02 09:26:14.000000000 +0000
+++ 3.0.1-0ubuntu1/src/lookup.c 2012-01-03 09:10:16.000000000 +0000
@@ -18,9 +18,14 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <glib/gprintf.h>
+#include <sys/types.h>
#include "lookup.h"
#include "utils.h"
diff -pruN 3.0.0-2/src/lookup.h 3.0.1-0ubuntu1/src/lookup.h
--- 3.0.0-2/src/lookup.h 2010-12-02 09:26:14.000000000 +0000
+++ 3.0.1-0ubuntu1/src/lookup.h 2011-12-31 23:54:24.000000000 +0000
@@ -18,9 +18,6 @@
*/
#include <glib.h>
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
#include "nettool.h"
diff -pruN 3.0.0-2/src/main.c 3.0.1-0ubuntu1/src/main.c
--- 3.0.0-2/src/main.c 2011-01-11 10:32:42.000000000 +0000
+++ 3.0.1-0ubuntu1/src/main.c 2012-02-16 05:03:12.000000000 +0000
@@ -24,6 +24,7 @@
#include <string.h>
#include <glib/gi18n.h>
+#include <launchpad-integration.h>
#include <glibtop.h>
@@ -57,6 +58,7 @@ main (int argc, char *argv[])
GtkBuilder *builder;
GtkWidget *notebook;
GtkWidget *statusbar;
+ GtkUIManager *ui;
const gchar *dialog = UI_DIR "gnome-nettool.ui";
Netinfo *pinger;
Netinfo *tracer;
@@ -218,6 +220,9 @@ main (int argc, char *argv[])
g_object_set_data (G_OBJECT (notebook), "whois", whois);
menu_beep = GTK_ACTION (gtk_builder_get_object (builder, "m_beep"));
+ ui = GTK_UI_MANAGER (gtk_builder_get_object (builder, "uimanager1"));
+ g_object_ref (ui);
+ launchpad_integration_add_ui (ui, "/ui/menubar1/help1/LaunchpadItems");
g_signal_connect (G_OBJECT (menu_beep), "activate",
G_CALLBACK (on_beep_activate),
diff -pruN 3.0.0-2/src/Makefile.in 3.0.1-0ubuntu1/src/Makefile.in
--- 3.0.0-2/src/Makefile.in 2011-04-04 08:31:35.000000000 +0000
+++ 3.0.1-0ubuntu1/src/Makefile.in 2012-01-03 09:26:48.000000000 +0000
@@ -113,6 +113,7 @@ DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -150,6 +151,7 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
@@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -225,7 +228,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff -pruN 3.0.0-2/src/netstat.c 3.0.1-0ubuntu1/src/netstat.c
--- 3.0.0-2/src/netstat.c 2010-12-02 09:26:14.000000000 +0000
+++ 3.0.1-0ubuntu1/src/netstat.c 2012-01-03 09:10:16.000000000 +0000
@@ -16,6 +16,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <string.h>
#include <gtk/gtk.h>
@@ -110,12 +114,20 @@ netstat_get_active_option (Netinfo * net
g_return_val_if_fail (netinfo != NULL, NULL);
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (netinfo->routing))) {
+#if defined (__OpenBSD__)
+ if (netinfo_is_ipv6_enable ()) {
+ option = g_strdup ("-rn");
+ } else {
+ option = g_strdup ("-rn -f inet");
+ }
+#else
/* Works for Solaris and Linux */
if (netinfo_is_ipv6_enable ()) {
option = g_strdup ("-rn -A inet -A inet6");
} else {
option = g_strdup ("-rn -A inet");
}
+#endif
if (netinfo->stbar_text)
g_free (netinfo->stbar_text);
@@ -485,8 +497,10 @@ netstat_route_tree_insert (GtkTreeView *
g_return_if_fail (line != NULL);
count = strip_route_line (line, &data);
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__DragonFly__)
if (count == 6) {
+#elif defined(__OpenBSD__)
+ if (count == 8) {
#else
if ((count == 8) || (count == 7)) {
#endif
@@ -557,16 +571,25 @@ strip_route_line (gchar * line, netstat_
gint count = 0;
gchar flags[30];
gint ref, use;
-#ifndef __FreeBDD__
+#if !defined (__FreeBSD__) && !defined(__OpenBSD__)
gchar dest[50];
gchar **items;
#endif
+#if defined(__OpenBSD__)
+ gint mtu, prio;
+#endif
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__DragonFly__)
count = sscanf (line, NETSTAT_ROUTE_FORMAT,
data->destination,
data->gateway, flags,
&ref, &use, data->iface);
+#elif defined(__OpenBSD__)
+ count = sscanf (line, NETSTAT_ROUTE_FORMAT,
+ data->destination,
+ data->gateway, flags,
+ &ref, &use, &mtu, &prio,
+ data->iface);
#else
count = sscanf (line, NETSTAT_ROUTE_FORMAT,
data->destination,
diff -pruN 3.0.0-2/src/netstat.h 3.0.1-0ubuntu1/src/netstat.h
--- 3.0.0-2/src/netstat.h 2010-12-02 09:26:14.000000000 +0000
+++ 3.0.1-0ubuntu1/src/netstat.h 2012-01-03 09:10:16.000000000 +0000
@@ -17,9 +17,6 @@
*/
#include <glib.h>
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
#include "nettool.h"
@@ -30,12 +27,18 @@
# define NETSTAT_ROUTE6_FORMAT "%s %s %s %d %d %d %s"
# define NETSTAT_MULTICAST_FORMAT "%s %d %s"
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__DragonFly__)
# define NETSTAT_PROTOCOL_FORMAT "%s %d %d %d.%d.%d.%d.%s %s %s"
# define ALT_NETSTAT_PROTOCOL_FORMAT "%s %d %d *.%s %s %s"
# define NETSTAT_ROUTE_FORMAT "%s %s %s %d %d %s"
# define NETSTAT_MULTICAST_FORMAT "%s %d %s"
+#elif defined(__OpenBSD__)
+# define NETSTAT_PROTOCOL_FORMAT "%s %d %d %d.%d.%d.%d.%s %s %s"
+# define ALT_NETSTAT_PROTOCOL_FORMAT "%s %d %d *.%s %s %s"
+# define NETSTAT_ROUTE_FORMAT "%s %s %s %d %d %s %d %s"
+# define NETSTAT_MULTICAST_FORMAT "%s %d %s"
+
#endif
typedef enum {
diff -pruN 3.0.0-2/src/nettool.c 3.0.1-0ubuntu1/src/nettool.c
--- 3.0.0-2/src/nettool.c 2010-12-02 09:26:14.000000000 +0000
+++ 3.0.1-0ubuntu1/src/nettool.c 2012-01-03 09:10:16.000000000 +0000
@@ -18,12 +18,17 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <unistd.h>
#include <string.h>
#include <sys/types.h>
#include <sys/socket.h>
+#include <netinet/in.h>
#include <signal.h>
#include <errno.h>
#include <sys/wait.h>
@@ -137,21 +142,21 @@ netinfo_get_ip_version (Netinfo * netinf
(GTK_BIN (netinfo->host)))));
if (strlen (ip) > 0) {
- host = gethostbyname2 (ip, AF_INET6);
+ host = gethostbyname2 (ip, AF_INET);
if (host == NULL) {
- host = gethostbyname2 (ip, AF_INET);
+ host = gethostbyname2 (ip, AF_INET6);
if (host == NULL)
return -1;
else {
g_free (ip);
- return IPV4;
+ return IPV6;
}
return -1;
}
else {
g_free (ip);
- return IPV6;
+ return IPV4;
}
}
diff -pruN 3.0.0-2/src/nettool.h 3.0.1-0ubuntu1/src/nettool.h
--- 3.0.0-2/src/nettool.h 2010-12-02 09:26:14.000000000 +0000
+++ 3.0.1-0ubuntu1/src/nettool.h 2012-01-03 09:10:16.000000000 +0000
@@ -19,9 +19,6 @@
#include <glib.h>
#include <gtk/gtk.h>
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
#include "gn-combo-history.h"
diff -pruN 3.0.0-2/src/ping.c 3.0.1-0ubuntu1/src/ping.c
--- 3.0.0-2/src/ping.c 2012-02-16 05:03:13.000000000 +0000
+++ 3.0.1-0ubuntu1/src/ping.c 2012-01-03 09:10:16.000000000 +0000
@@ -18,6 +18,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <glib/gprintf.h>
@@ -337,8 +341,9 @@ ping_do (Netinfo * netinfo)
count_string, host);
#endif
}
+#ifdef DEBUG
g_print("command: %s\n", command);
-
+#endif
netinfo->command_line = g_strsplit (command, " ", -1);
netinfo_process_command (netinfo);
diff -pruN 3.0.0-2/src/ping.h 3.0.1-0ubuntu1/src/ping.h
--- 3.0.0-2/src/ping.h 2012-02-16 05:03:13.000000000 +0000
+++ 3.0.1-0ubuntu1/src/ping.h 2011-12-31 23:54:24.000000000 +0000
@@ -17,9 +17,6 @@
*/
#include <glib.h>
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
#include "nettool.h"
diff -pruN 3.0.0-2/src/scan.c 3.0.1-0ubuntu1/src/scan.c
--- 3.0.0-2/src/scan.c 2010-12-02 09:26:14.000000000 +0000
+++ 3.0.1-0ubuntu1/src/scan.c 2012-01-03 09:10:16.000000000 +0000
@@ -19,6 +19,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <glib/gprintf.h>
diff -pruN 3.0.0-2/src/scan.h 3.0.1-0ubuntu1/src/scan.h
--- 3.0.0-2/src/scan.h 2010-12-02 09:26:14.000000000 +0000
+++ 3.0.1-0ubuntu1/src/scan.h 2012-01-03 09:10:16.000000000 +0000
@@ -17,9 +17,6 @@
*/
#include <glib.h>
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
#include "nettool.h"
diff -pruN 3.0.0-2/src/traceroute.c 3.0.1-0ubuntu1/src/traceroute.c
--- 3.0.0-2/src/traceroute.c 2010-12-02 09:26:14.000000000 +0000
+++ 3.0.1-0ubuntu1/src/traceroute.c 2012-02-16 05:03:12.000000000 +0000
@@ -17,6 +17,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <glib/gprintf.h>
@@ -71,20 +75,16 @@ traceroute_do (Netinfo * netinfo)
switch (netinfo_get_ip_version (netinfo))
{
case IPV4:
- program = util_find_program_in_path ("tcptraceroute", NULL);
+
#ifdef DEBUG
- g_print ("tcptraceroute: %s\n", program);
+ g_print ("tracepath: %s\n", program);
#endif /* DEBUG */
- if (program != NULL) {
- program_name = g_strdup ("tcptraceroute");
- } else {
- program = util_find_program_dialog ("traceroute", parent);
- program_name = g_strdup ("traceroute");
- }
+ program = util_find_program_dialog ("tracepath", parent);
+ program_name = g_strdup ("tracepath");
break;
case IPV6:
- program = util_find_program_in_path ("traceroute6", NULL);
- program_name = g_strdup ("traceroute6");
+ program = util_find_program_in_path ("tracepath6", NULL);
+ program_name = g_strdup ("tracepath6");
break;
default:
program = NULL;
@@ -93,8 +93,7 @@ traceroute_do (Netinfo * netinfo)
if (program != NULL) {
command =
- g_strdup_printf ("%s %s %s %s", program, program_name,
- TCPTRACEROUTE_OPTIONS, host);
+ g_strdup_printf ("%s %s %s", program, program_name, host);
netinfo->command_line = g_strsplit (command, " ", -1);
@@ -217,7 +216,7 @@ strip_line (gchar * line, traceroute_dat
count = sscanf (line, TRACE_FORMAT,
&(data)->hop_count, data->hostname, data->ip,
- data->rtt1, data->rtt2/*, data->rtt3*/);
+ data->rtt1/*, data->rtt2, data->rtt3*/);
if (count == TRACE_NUM_ARGS) {
return count;
@@ -225,7 +224,7 @@ strip_line (gchar * line, traceroute_dat
if (count == TRACE_NUM_ERR) {
g_sprintf (data->rtt1, "*");
- g_sprintf (data->rtt2, "*");
+ //g_sprintf (data->rtt2, "*");
return TRACE_NUM_ARGS;
}
/* The last line is different, because it has a
@@ -235,14 +234,14 @@ strip_line (gchar * line, traceroute_dat
count = sscanf (line, TRACE_FORMAT_OPEN,
&(data)->hop_count, data->hostname, data->ip,
- data->rtt1, data->rtt2/*, data->rtt3*/);
+ data->rtt1/*, data->rtt2, data->rtt3*/);
if (count == TRACE_NUM_ARGS) {
return count;
} else {
count = sscanf (line, TRACE_FORMAT_CLOSE,
&(data)->hop_count, data->hostname,
- data->ip, data->rtt1, data->rtt2 /*,
+ data->ip, data->rtt1/*, data->rtt2,
data->rtt3*/);
}
@@ -301,7 +300,7 @@ traceroute_create_model (GtkTreeView *wi
gtk_tree_view_column_new_with_attributes
(_("Time 2"), renderer, "text", TRACE_RTT2, NULL);
g_object_set (G_OBJECT (renderer), "xalign", 1.0, NULL);
- gtk_tree_view_append_column (widget, column);
+ //gtk_tree_view_append_column (widget, column);
model = GTK_TREE_MODEL (gtk_list_store_new
(TRACE_NUM_COLUMNS,
diff -pruN 3.0.0-2/src/traceroute.h 3.0.1-0ubuntu1/src/traceroute.h
--- 3.0.0-2/src/traceroute.h 2010-12-02 09:26:14.000000000 +0000
+++ 3.0.1-0ubuntu1/src/traceroute.h 2012-02-16 05:03:12.000000000 +0000
@@ -17,18 +17,15 @@
*/
#include <glib.h>
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
#include "nettool.h"
-#define TRACE_FORMAT "%d %s %s %s ms %s ms"
+#define TRACE_FORMAT "%d: %s %s %sms"
#define TRACE_FORMAT_CLOSE "%d %s %s [closed] %s ms %s ms"
#define TRACE_FORMAT_OPEN "%d %s %s [open] %s ms %s ms"
#define TRACE_SELECT_DEVICE "Selected device %s address %s port %d for outgoing packets"
#define TRACE_TRACE_PATH "Tracing the path to %s (146.83.195.14) on TCP port 80 %d hops max"
-#define TRACE_NUM_ARGS 5
+#define TRACE_NUM_ARGS 4
#define TRACE_NUM_ERR 3
/* Try 40 hops maximum and send only 1 packet */
diff -pruN 3.0.0-2/src/util-mii.c 3.0.1-0ubuntu1/src/util-mii.c
--- 3.0.0-2/src/util-mii.c 2010-12-02 09:26:14.000000000 +0000
+++ 3.0.1-0ubuntu1/src/util-mii.c 2012-01-03 09:10:16.000000000 +0000
@@ -39,6 +39,10 @@
* http://www.national.com/pf/DP/DP83840.html
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#ifdef __linux__
#include <glib.h>
#include <glib/gprintf.h>
diff -pruN 3.0.0-2/src/utils.c 3.0.1-0ubuntu1/src/utils.c
--- 3.0.0-2/src/utils.c 2010-12-02 09:26:14.000000000 +0000
+++ 3.0.1-0ubuntu1/src/utils.c 2012-01-03 09:10:16.000000000 +0000
@@ -23,6 +23,10 @@
/* This is a backport of g_sprintf to allow compile gnome-netinfo
on GNOME 2.0 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "utils.h"
#include <string.h>
#include <glib/gi18n.h>
diff -pruN 3.0.0-2/src/utils.h 3.0.1-0ubuntu1/src/utils.h
--- 3.0.0-2/src/utils.h 2010-12-02 09:26:14.000000000 +0000
+++ 3.0.1-0ubuntu1/src/utils.h 2011-12-31 23:54:24.000000000 +0000
@@ -25,9 +25,6 @@
#include <glib.h>
#include <gtk/gtk.h>
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
#if (GLIB_MINOR_VERSION < 2)
diff -pruN 3.0.0-2/src/whois.c 3.0.1-0ubuntu1/src/whois.c
--- 3.0.0-2/src/whois.c 2010-12-02 09:26:14.000000000 +0000
+++ 3.0.1-0ubuntu1/src/whois.c 2012-01-03 09:10:16.000000000 +0000
@@ -18,6 +18,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <string.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
diff -pruN 3.0.0-2/src/whois.h 3.0.1-0ubuntu1/src/whois.h
--- 3.0.0-2/src/whois.h 2010-12-02 09:26:14.000000000 +0000
+++ 3.0.1-0ubuntu1/src/whois.h 2011-12-31 23:54:24.000000000 +0000
@@ -17,11 +17,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
#include "nettool.h"
#define WHOIS_OPTIONS ""
[Date Prev][
Date Next] [Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
