diff --git a/Makefile.in b/Makefile.in index ce1c2e26..35822b3d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -99,9 +99,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ diff --git a/NEWS b/NEWS index 31fa0de8..21c7e299 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,12 @@ +11 March 2019: Overview of changes in 2.40.0 +================================================ + +* Fixed array and transfer annotations for documentation + +18 February 2019: Overview of changes in 2.39.91 + +* Replace deprecated gnome-common with autoreconf + 04 February 2019: Overview of changes in 2.39.90 ================================================ diff --git a/aclocal.m4 b/aclocal.m4 index f7505c84..5fe5d8d6 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -20,350 +20,6 @@ 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 11 (pkg-config-0.29.1) - -dnl Copyright © 2004 Scott James Remnant . -dnl Copyright © 2012-2015 Dan Nicholson -dnl -dnl This program is free software; you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 2 of the License, or -dnl (at your option) any later version. -dnl -dnl This program is distributed in the hope that it will be useful, but -dnl WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License -dnl along with this program; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -dnl 02111-1307, USA. -dnl -dnl As a special exception to the GNU General Public License, if you -dnl distribute this file as part of a program that contains a -dnl configuration script generated by Autoconf, you may include it under -dnl the same distribution terms that you use for the rest of that -dnl program. - -dnl PKG_PREREQ(MIN-VERSION) -dnl ----------------------- -dnl Since: 0.29 -dnl -dnl Verify that the version of the pkg-config macros are at least -dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's -dnl installed version of pkg-config, this checks the developer's version -dnl of pkg.m4 when generating configure. -dnl -dnl To ensure that this macro is defined, also add: -dnl m4_ifndef([PKG_PREREQ], -dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) -dnl -dnl See the "Since" comment for each macro you use to see what version -dnl of the macros you require. -m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29.1]) -m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, - [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) -])dnl PKG_PREREQ - -dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) -dnl ---------------------------------- -dnl Since: 0.16 -dnl -dnl Search for the pkg-config tool and set the PKG_CONFIG variable to -dnl first found in the path. Checks that the version of pkg-config found -dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is -dnl used since that's the first version where most current features of -dnl pkg-config existed. -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) -m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) - -if test "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 -])dnl PKG_PROG_PKG_CONFIG - -dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -dnl ------------------------------------------------------------------- -dnl Since: 0.18 -dnl -dnl Check to see whether a particular set of modules exists. Similar to -dnl PKG_CHECK_MODULES(), but does not set variables or print errors. -dnl -dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -dnl only at the first occurence in configure.ac, so if the first place -dnl it's called might be skipped (such as if it is within an "if", you -dnl have to call PKG_CHECK_EXISTS manually -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) - -dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -dnl --------------------------------------------- -dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting -dnl pkg_failed based on the result. -m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - 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 -])dnl _PKG_CONFIG - -dnl _PKG_SHORT_ERRORS_SUPPORTED -dnl --------------------------- -dnl Internal check to see if pkg-config supports short errors. -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])dnl _PKG_SHORT_ERRORS_SUPPORTED - - -dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -dnl [ACTION-IF-NOT-FOUND]) -dnl -------------------------------------------------------------- -dnl Since: 0.4.0 -dnl -dnl Note that if there is a possibility the first call to -dnl PKG_CHECK_MODULES might not happen, you should be sure to include an -dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - -pkg_failed=no -AC_MSG_CHECKING([for $1]) - -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) - -if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - - 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 .])[]dnl - ]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - $3 -fi[]dnl -])dnl PKG_CHECK_MODULES - - -dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -dnl [ACTION-IF-NOT-FOUND]) -dnl --------------------------------------------------------------------- -dnl Since: 0.29 -dnl -dnl Checks for existence of MODULES and gathers its build flags with -dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags -dnl and VARIABLE-PREFIX_LIBS from --libs. -dnl -dnl Note that if there is a possibility the first call to -dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to -dnl include an explicit call to PKG_PROG_PKG_CONFIG in your -dnl configure.ac. -AC_DEFUN([PKG_CHECK_MODULES_STATIC], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -_save_PKG_CONFIG=$PKG_CONFIG -PKG_CONFIG="$PKG_CONFIG --static" -PKG_CHECK_MODULES($@) -PKG_CONFIG=$_save_PKG_CONFIG[]dnl -])dnl PKG_CHECK_MODULES_STATIC - - -dnl PKG_INSTALLDIR([DIRECTORY]) -dnl ------------------------- -dnl Since: 0.27 -dnl -dnl Substitutes the variable pkgconfigdir as the location where a module -dnl should install pkg-config .pc files. By default the directory is -dnl $libdir/pkgconfig, but the default can be changed by passing -dnl DIRECTORY. The user can override through the --with-pkgconfigdir -dnl parameter. -AC_DEFUN([PKG_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([pkgconfigdir], - [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, - [with_pkgconfigdir=]pkg_default) -AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -])dnl PKG_INSTALLDIR - - -dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) -dnl -------------------------------- -dnl Since: 0.27 -dnl -dnl Substitutes the variable noarch_pkgconfigdir as the location where a -dnl module should install arch-independent pkg-config .pc files. By -dnl default the directory is $datadir/pkgconfig, but the default can be -dnl changed by passing DIRECTORY. The user can override through the -dnl --with-noarch-pkgconfigdir parameter. -AC_DEFUN([PKG_NOARCH_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([noarch-pkgconfigdir], - [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, - [with_noarch_pkgconfigdir=]pkg_default) -AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -])dnl PKG_NOARCH_INSTALLDIR - - -dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -dnl ------------------------------------------- -dnl Since: 0.28 -dnl -dnl Retrieves the value of the pkg-config variable for the given module. -AC_DEFUN([PKG_CHECK_VAR], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl - -_PKG_CONFIG([$1], [variable="][$3]["], [$2]) -AS_VAR_COPY([$1], [pkg_cv_][$1]) - -AS_VAR_IF([$1], [""], [$5], [$4])dnl -])dnl PKG_CHECK_VAR - -dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, -dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], -dnl [DESCRIPTION], [DEFAULT]) -dnl ------------------------------------------ -dnl -dnl Prepare a "--with-" configure option using the lowercase -dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and -dnl PKG_CHECK_MODULES in a single macro. -AC_DEFUN([PKG_WITH_MODULES], -[ -m4_pushdef([with_arg], m4_tolower([$1])) - -m4_pushdef([description], - [m4_default([$5], [build with ]with_arg[ support])]) - -m4_pushdef([def_arg], [m4_default([$6], [auto])]) -m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes]) -m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no]) - -m4_case(def_arg, - [yes],[m4_pushdef([with_without], [--without-]with_arg)], - [m4_pushdef([with_without],[--with-]with_arg)]) - -AC_ARG_WITH(with_arg, - AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),, - [AS_TR_SH([with_]with_arg)=def_arg]) - -AS_CASE([$AS_TR_SH([with_]with_arg)], - [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)], - [auto],[PKG_CHECK_MODULES([$1],[$2], - [m4_n([def_action_if_found]) $3], - [m4_n([def_action_if_not_found]) $4])]) - -m4_popdef([with_arg]) -m4_popdef([description]) -m4_popdef([def_arg]) - -])dnl PKG_WITH_MODULES - -dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, -dnl [DESCRIPTION], [DEFAULT]) -dnl ----------------------------------------------- -dnl -dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES -dnl check._[VARIABLE-PREFIX] is exported as make variable. -AC_DEFUN([PKG_HAVE_WITH_MODULES], -[ -PKG_WITH_MODULES([$1],[$2],,,[$3],[$4]) - -AM_CONDITIONAL([HAVE_][$1], - [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"]) -])dnl PKG_HAVE_WITH_MODULES - -dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, -dnl [DESCRIPTION], [DEFAULT]) -dnl ------------------------------------------------------ -dnl -dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after -dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make -dnl and preprocessor variable. -AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES], -[ -PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4]) - -AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], - [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) -])dnl PKG_HAVE_DEFINE_WITH_MODULES - # Copyright (C) 2002-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -1491,6 +1147,7 @@ m4_include([m4/ltsugar.m4]) m4_include([m4/ltversion.m4]) m4_include([m4/lt~obsolete.m4]) m4_include([m4/nls.m4]) +m4_include([m4/pkg.m4]) m4_include([m4/po.m4]) m4_include([m4/progtest.m4]) m4_include([acinclude.m4]) diff --git a/autogen.sh b/autogen.sh index 72573680..9d394bff 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,20 +1,40 @@ #!/bin/sh # Run this to generate all the initial makefiles, etc. +test -n "$srcdir" || srcdir=$(dirname "$0") +test -n "$srcdir" || srcdir=. -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. +olddir=$(pwd) -(test -f $srcdir/configure.ac \ - && test -f $srcdir/copyright.txt \ - && test -d $srcdir/sysdeps) || { - echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level gnome directory" - exit 1 +cd $srcdir + +(test -f configure.ac) || { + echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***" + exit 1 } -which gnome-autogen.sh || { - echo "You need to install gnome-common from the GNOME CVS" - exit 1 -} -REQUIRED_AUTOMAKE_VERSION=1.9 -. gnome-autogen.sh +# shellcheck disable=SC2016 +PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac) + +if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then + echo "*** WARNING: I am going to run 'configure' with no arguments." >&2 + echo "*** If you wish to pass any to it, please specify them on the" >&2 + echo "*** '$0' command line." >&2 + echo "" >&2 +fi + +aclocal --install || exit 1 +gtkdocize --copy || exit 1 +autoreconf --verbose --force --install || exit 1 + +cd "$olddir" +if [ "$NOCONFIGURE" = "" ]; then + $srcdir/configure "$@" || exit 1 + + if [ "$1" = "--help" ]; then + exit 0 + else + echo "Now type 'make' to compile $PKG_NAME" || exit 1 + fi +else + echo "Skipping configure process." +fi diff --git a/configure b/configure index c3317bd8..6a1f32d2 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libgtop 2.39.90. +# Generated by GNU Autoconf 2.69 for libgtop 2.40.0. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libgtop' PACKAGE_TARNAME='libgtop' -PACKAGE_VERSION='2.39.90' -PACKAGE_STRING='libgtop 2.39.90' +PACKAGE_VERSION='2.40.0' +PACKAGE_STRING='libgtop 2.40.0' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop' PACKAGE_URL='' @@ -1435,7 +1435,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 libgtop 2.39.90 to adapt to many kinds of systems. +\`configure' configures libgtop 2.40.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1509,7 +1509,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libgtop 2.39.90:";; + short | recursive ) echo "Configuration of libgtop 2.40.0:";; esac cat <<\_ACEOF @@ -1649,7 +1649,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libgtop configure 2.39.90 +libgtop configure 2.40.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2129,7 +2129,7 @@ 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 libgtop $as_me 2.39.90, which was +It was created by libgtop $as_me 2.40.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3072,7 +3072,7 @@ fi # Define the identity of the package. PACKAGE='libgtop' - VERSION='2.39.90' + VERSION='2.40.0' cat >>confdefs.h <<_ACEOF @@ -3542,15 +3542,15 @@ ACLOCAL_AMFLAGS=\${ACLOCAL_FLAGS} LIBGTOP_MAJOR_VERSION=2 -LIBGTOP_MINOR_VERSION=39 +LIBGTOP_MINOR_VERSION=40 -LIBGTOP_MICRO_VERSION=90 +LIBGTOP_MICRO_VERSION=0 LIBGTOP_SERVER_VERSION=5 -LIBGTOP_VERSION=2.39.90 +LIBGTOP_VERSION=2.40.0 -LIBGTOP_VERSION_CODE=2039090 +LIBGTOP_VERSION_CODE=2040000 # libtool versioning @@ -19620,13 +19620,13 @@ AM_CPPFLAGS="-I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysde $as_echo "#define _IN_LIBGTOP 1" >>confdefs.h -$as_echo "#define LIBGTOP_VERSION \"2.39.90\"" >>confdefs.h +$as_echo "#define LIBGTOP_VERSION \"2.40.0\"" >>confdefs.h $as_echo "#define LIBGTOP_SERVER_VERSION \"5\"" >>confdefs.h -$as_echo "#define LIBGTOP_VERSION_CODE 2039090" >>confdefs.h +$as_echo "#define LIBGTOP_VERSION_CODE 2040000" >>confdefs.h cat >>confdefs.h <<_ACEOF @@ -20613,7 +20613,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libgtop $as_me 2.39.90, which was +This file was extended by libgtop $as_me 2.40.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20679,7 +20679,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libgtop config.status 2.39.90 +libgtop config.status 2.40.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index ade5c440..472f44b4 100644 --- a/configure.ac +++ b/configure.ac @@ -3,8 +3,8 @@ dnl Configure script for the Gnome library dnl m4_define([libgtop_major_version], [2]) -m4_define([libgtop_minor_version], [39]) -m4_define([libgtop_micro_version], [90]) +m4_define([libgtop_minor_version], [40]) +m4_define([libgtop_micro_version], [0]) m4_define([libgtop_version], [libgtop_major_version.libgtop_minor_version.libgtop_micro_version]) dnl increment if the interface has additions, changes, removals. diff --git a/doc/Makefile.in b/doc/Makefile.in index 4cdfa6f2..8fa4e22d 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -97,9 +97,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/version.texi \ diff --git a/doc/libgtop2.info b/doc/libgtop2.info index 7e2b160a..ac598065 100644 --- a/doc/libgtop2.info +++ b/doc/libgtop2.info @@ -8,7 +8,7 @@ START-INFO-DIR-ENTRY processes END-INFO-DIR-ENTRY -This is the LibGTop Reference Manual version 2.39.90 (last modified 4 +This is the LibGTop Reference Manual version 2.40.0 (last modified 4 February 2019). Copyright 1999 Free Software Foundation, Inc. @@ -1909,42 +1909,42 @@ you may not set all parameters since some of them are read-only.  Tag Table: -Node: Top1206 -Node: About3357 -Node: Availability4235 -Node: Supported Platforms4855 -Node: Mailing List6466 -Node: Thanks7238 -Node: White Paper7948 -Node: Introduction8181 -Node: Overview9896 -Node: Interface Design10263 -Node: Server Implementation11290 -Node: Reference Manual12007 -Node: System Dependent12311 -Node: glibtop_cpu13386 -Node: glibtop_mem16013 -Node: glibtop_swap17175 -Node: glibtop_uptime18407 -Node: glibtop_loadavg19702 -Node: glibtop_proclist20710 -Node: glibtop_proc_state23917 -Node: glibtop_proc_uid26483 -Node: glibtop_proc_mem28055 -Node: glibtop_proc_time31750 -Node: glibtop_proc_signal33902 -Node: glibtop_proc_kernel34947 -Node: glibtop_proc_segment37832 -Node: glibtop_proc_args39070 -Node: glibtop_proc_map40812 -Node: glibtop_netload42789 -Node: glibtop_ppp45297 -Node: Common Functions46355 -Node: glibtop_mountlist46780 -Node: glibtop_fsusage48696 -Node: Library Functions49789 -Node: glibtop_init50216 -Node: glibtop_sysdeps52967 -Node: Library Parameters55578 +Node: Top1205 +Node: About3356 +Node: Availability4234 +Node: Supported Platforms4854 +Node: Mailing List6465 +Node: Thanks7237 +Node: White Paper7947 +Node: Introduction8180 +Node: Overview9895 +Node: Interface Design10262 +Node: Server Implementation11289 +Node: Reference Manual12006 +Node: System Dependent12310 +Node: glibtop_cpu13385 +Node: glibtop_mem16012 +Node: glibtop_swap17174 +Node: glibtop_uptime18406 +Node: glibtop_loadavg19701 +Node: glibtop_proclist20709 +Node: glibtop_proc_state23916 +Node: glibtop_proc_uid26482 +Node: glibtop_proc_mem28054 +Node: glibtop_proc_time31749 +Node: glibtop_proc_signal33901 +Node: glibtop_proc_kernel34946 +Node: glibtop_proc_segment37831 +Node: glibtop_proc_args39069 +Node: glibtop_proc_map40811 +Node: glibtop_netload42788 +Node: glibtop_ppp45296 +Node: Common Functions46354 +Node: glibtop_mountlist46779 +Node: glibtop_fsusage48695 +Node: Library Functions49788 +Node: glibtop_init50215 +Node: glibtop_sysdeps52966 +Node: Library Parameters55577  End Tag Table diff --git a/doc/reference/Makefile.in b/doc/reference/Makefile.in index 31155a22..2f0cef89 100644 --- a/doc/reference/Makefile.in +++ b/doc/reference/Makefile.in @@ -121,9 +121,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) diff --git a/doc/reference/html/index.html b/doc/reference/html/index.html index 703a4fc7..c00311ae 100644 --- a/doc/reference/html/index.html +++ b/doc/reference/html/index.html @@ -33,7 +33,7 @@   

-

for libgtop 2.39.90

+

for libgtop 2.40.0

Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free diff --git a/doc/reference/html/libgtop-Net-List.html b/doc/reference/html/libgtop-Net-List.html index a7611b2d..c539e3a1 100644 --- a/doc/reference/html/libgtop-Net-List.html +++ b/doc/reference/html/libgtop-Net-List.html @@ -139,7 +139,7 @@ glibtop_get_netlist (

Returns

an array of network interface names.

-

[array zero-terminated=1][transfer none]

+

[array zero-terminated=1][transfer full]

@@ -174,7 +174,7 @@ glibtop_get_netlist_l (

Returns

an array of network interface names.

-

[array zero-terminated=1][transfer none]

+

[array zero-terminated=1][transfer full]

@@ -209,7 +209,7 @@ glibtop_get_netlist_p (

Returns

an array of network interface names.

-

[array zero-terminated=1][transfer none]

+

[array zero-terminated=1][transfer full]

@@ -244,7 +244,7 @@ glibtop_get_netlist_s (

Returns

an array of network interface names.

-

[array zero-terminated=1][transfer none]

+

[array zero-terminated=1][transfer full]

diff --git a/doc/reference/html/libgtop-mountlist.html b/doc/reference/html/libgtop-mountlist.html index f86b6ab0..91cbb82f 100644 --- a/doc/reference/html/libgtop-mountlist.html +++ b/doc/reference/html/libgtop-mountlist.html @@ -123,7 +123,7 @@ glibtop_get_mountlist (

Returns

.

-

[transfer full]

+

[transfer full][array zero-terminated=1]

@@ -151,7 +151,7 @@ glibtop_get_mountlist_l (

Returns

.

-

[transfer none]

+

[transfer full][array zero-terminated=1]

@@ -179,7 +179,7 @@ glibtop_get_mountlist_s (

Returns

.

-

[transfer none]

+

[transfer full][array zero-terminated=1]

@@ -253,7 +253,7 @@ glibtop_get_mountlist_s (

Returns

.

-

[transfer none]

+

[transfer full][array zero-terminated=1]

diff --git a/doc/reference/html/libgtop-procmap.html b/doc/reference/html/libgtop-procmap.html index e0cc410f..9d537a9a 100644 --- a/doc/reference/html/libgtop-procmap.html +++ b/doc/reference/html/libgtop-procmap.html @@ -211,7 +211,7 @@ glibtop_get_proc_map (

Returns

.

-

[transfer none]

+

[transfer full][array zero-terminated=1]

@@ -239,7 +239,7 @@ glibtop_get_proc_map_l (

Returns

.

-

[transfer none]

+

[transfer full][array zero-terminated=1]

@@ -267,7 +267,7 @@ glibtop_get_proc_map_p (

Returns

.

-

[transfer none]

+

[transfer full][array zero-terminated=1]

@@ -295,7 +295,7 @@ glibtop_get_proc_map_s (

Returns

.

-

[transfer none]

+

[transfer full][array zero-terminated=1]

diff --git a/doc/reference/html/libgtop-procopenfiles.html b/doc/reference/html/libgtop-procopenfiles.html index 34eec1c0..1aa5e6c6 100644 --- a/doc/reference/html/libgtop-procopenfiles.html +++ b/doc/reference/html/libgtop-procopenfiles.html @@ -163,7 +163,7 @@ glibtop_get_proc_open_files (

Returns

.

-

[transfer none]

+

[transfer full][array zero-terminated=1]

@@ -191,7 +191,7 @@ glibtop_get_proc_open_files_l (

Returns

.

-

[transfer none]

+

[transfer full][array zero-terminated=1]

@@ -219,7 +219,7 @@ glibtop_get_proc_open_files_p (

Returns

.

-

[transfer none]

+

[transfer full][array zero-terminated=1]

diff --git a/doc/reference/version.xml b/doc/reference/version.xml index 99a8ac08..7fff64ef 100644 --- a/doc/reference/version.xml +++ b/doc/reference/version.xml @@ -1,4 +1,4 @@ -2.39.90 +2.40.0 diff --git a/doc/stamp-vti b/doc/stamp-vti index d9f97137..4109b26f 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ @set UPDATED 4 February 2019 @set UPDATED-MONTH February 2019 -@set EDITION 2.39.90 -@set VERSION 2.39.90 +@set EDITION 2.40.0 +@set VERSION 2.40.0 diff --git a/doc/version.texi b/doc/version.texi index d9f97137..4109b26f 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ @set UPDATED 4 February 2019 @set UPDATED-MONTH February 2019 -@set EDITION 2.39.90 -@set VERSION 2.39.90 +@set EDITION 2.40.0 +@set VERSION 2.40.0 diff --git a/examples/Makefile.in b/examples/Makefile.in index 71501f25..ae6b561c 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -104,9 +104,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) diff --git a/include/Makefile.in b/include/Makefile.in index 25ae74fb..ac072e74 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -97,9 +97,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) diff --git a/include/glibtop/Makefile.in b/include/glibtop/Makefile.in index 09513a48..7f903407 100644 --- a/include/glibtop/Makefile.in +++ b/include/glibtop/Makefile.in @@ -98,9 +98,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(glibtop_HEADERS) \ diff --git a/include/glibtop/mountlist.h b/include/glibtop/mountlist.h index f4691b36..f9d88cdf 100644 --- a/include/glibtop/mountlist.h +++ b/include/glibtop/mountlist.h @@ -58,7 +58,7 @@ struct _glibtop_mountlist * @buf: * @all_fs: * - * Returns: (transfer full): + * Returns: (transfer full) (array zero-terminated=1): */ /** @@ -66,7 +66,7 @@ struct _glibtop_mountlist * @buf: (out): * @all_fs: * - * Returns: (transfer none): + * Returns: (transfer full) (array zero-terminated=1): */ /** @@ -74,7 +74,7 @@ struct _glibtop_mountlist * @buf: (out): * @all_fs: * - * Returns: (transfer none): + * Returns: (transfer full) (array zero-terminated=1): */ /** @@ -82,7 +82,7 @@ struct _glibtop_mountlist * @buf: (out): * @all_fs: * - * Returns: (transfer none): + * Returns: (transfer full) (array zero-terminated=1): */ glibtop_mountentry * diff --git a/include/glibtop/netlist.h b/include/glibtop/netlist.h index f5ed2ffe..a6fc4abd 100644 --- a/include/glibtop/netlist.h +++ b/include/glibtop/netlist.h @@ -45,7 +45,7 @@ struct _glibtop_netlist * glibtop_get_netlist: * @buf: a #glibtop_netlist * - * Returns: (array zero-terminated=1) (transfer none): an array of network + * Returns: (array zero-terminated=1) (transfer full): an array of network * interface names. */ char** glibtop_get_netlist(glibtop_netlist *buf); @@ -61,7 +61,7 @@ char** glibtop_get_netlist(glibtop_netlist *buf); * @server: a #glibtop server * @buf: a #glibtop_netlist * - * Returns: (array zero-terminated=1) (transfer none): an array of network + * Returns: (array zero-terminated=1) (transfer full): an array of network * interface names. */ char** glibtop_get_netlist_l (glibtop *server, glibtop_netlist *buf); @@ -74,7 +74,7 @@ void _glibtop_init_netlist_p (glibtop *server); * @server: a #glibtop server * @buf: a #glibtop_netlist * - * Returns: (array zero-terminated=1) (transfer none): an array of network + * Returns: (array zero-terminated=1) (transfer full): an array of network * interface names. */ char** glibtop_get_netlist_p (glibtop *server, glibtop_netlist *buf); @@ -86,7 +86,7 @@ void _glibtop_init_netlist_s (glibtop *server); * @server: a #glibtop server * @buf: a #glibtop_netlist * - * Returns: (array zero-terminated=1) (transfer none): an array of network + * Returns: (array zero-terminated=1) (transfer full): an array of network * interface names. */ char** glibtop_get_netlist_s (glibtop *server, glibtop_netlist *buf); diff --git a/include/glibtop/proclist.h b/include/glibtop/proclist.h index 417d618a..4380de3d 100644 --- a/include/glibtop/proclist.h +++ b/include/glibtop/proclist.h @@ -133,7 +133,7 @@ struct _glibtop_proclist * @which: a #GLIBTOP_* constant specifying process type * @arg: an argument specific for the process type * - * Returns: (array zero-terminated=1) (transfer none): an array of process + * Returns: (array zero-terminated=1) (transfer full): an array of process * ids */ pid_t* @@ -152,7 +152,7 @@ glibtop_get_proclist(glibtop_proclist *buf, gint64 which, gint64 arg); * @which: a #GLIBTOP_* constant specifying process type * @arg: an argument specific for the process type * - * Returns: (array zero-terminated=1) (transfer none): an array of process + * Returns: (array zero-terminated=1) (transfer full): an array of process * ids */ pid_t* @@ -169,7 +169,7 @@ void _glibtop_init_proclist_p (glibtop *server); * @which: a #GLIBTOP_* constant specifying process type * @arg: an argument specific for the process type * - * Returns: (array zero-terminated=1) (transfer none): an array of process + * Returns: (array zero-terminated=1) (transfer full): an array of process * ids */ pid_t* @@ -185,7 +185,7 @@ void _glibtop_init_proclist_s (glibtop *server); * @which: a #GLIBTOP_* constant specifying process type * @arg: an argument specific for the process type * - * Returns: (array zero-terminated=1) (transfer none): an array of process + * Returns: (array zero-terminated=1) (transfer full): an array of process * ids */ pid_t* diff --git a/include/glibtop/procmap.h b/include/glibtop/procmap.h index e0516d7d..9466279b 100644 --- a/include/glibtop/procmap.h +++ b/include/glibtop/procmap.h @@ -98,7 +98,7 @@ struct _glibtop_proc_map * @buf: * @pid: * - * Returns: (transfer none): + * Returns: (transfer full) (array zero-terminated=1): */ glibtop_map_entry * glibtop_get_proc_map(glibtop_proc_map *buf, pid_t pid); @@ -111,7 +111,7 @@ glibtop_get_proc_map(glibtop_proc_map *buf, pid_t pid); * @buf: (out): * @pid: * - * Returns: (transfer none): + * Returns: (transfer full) (array zero-terminated=1): */ /** @@ -120,7 +120,7 @@ glibtop_get_proc_map(glibtop_proc_map *buf, pid_t pid); * @buf: (out): * @pid: * - * Returns: (transfer none): + * Returns: (transfer full) (array zero-terminated=1): */ /** @@ -129,7 +129,7 @@ glibtop_get_proc_map(glibtop_proc_map *buf, pid_t pid); * @buf: (out): * @pid: * - * Returns: (transfer none): + * Returns: (transfer full) (array zero-terminated=1): */ #if GLIBTOP_SUID_PROC_MAP diff --git a/include/glibtop/procopenfiles.h b/include/glibtop/procopenfiles.h index 4bcc2fda..42847965 100644 --- a/include/glibtop/procopenfiles.h +++ b/include/glibtop/procopenfiles.h @@ -99,7 +99,7 @@ struct _glibtop_proc_open_files * @buf: * @pid: * - * Returns: (transfer none): + * Returns: (transfer full) (array zero-terminated=1): */ glibtop_open_files_entry * @@ -118,7 +118,7 @@ glibtop_get_proc_open_files(glibtop_proc_open_files *buf, pid_t pid); * @buf: (out): * @pid: * - * Returns: (transfer none): + * Returns: (transfer full) (array zero-terminated=1): */ glibtop_open_files_entry * @@ -134,7 +134,7 @@ void _glibtop_init_proc_open_files_p (glibtop *server); * @buf: (out): * @pid: * - * Returns: (transfer none): + * Returns: (transfer full) (array zero-terminated=1): */ glibtop_open_files_entry * diff --git a/lib/Makefile.in b/lib/Makefile.in index 1e39dd31..1443c307 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -101,9 +101,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) diff --git a/libgtop.spec b/libgtop.spec index bc068403..5b0cc93d 100644 --- a/libgtop.spec +++ b/libgtop.spec @@ -1,5 +1,5 @@ # Note that this is NOT a relocatable package -%define ver 2.39.90 +%define ver 2.40.0 %define RELEASE SNAP %define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE} %define prefix /usr diff --git a/libgtopconfig.h b/libgtopconfig.h index dd804682..1204e4e7 100644 --- a/libgtopconfig.h +++ b/libgtopconfig.h @@ -2,7 +2,7 @@ #define LIBGTOPCONFIG_H #define LIBGTOP_MAJOR_VERSION 2 -#define LIBGTOP_MINOR_VERSION 39 -#define LIBGTOP_MICRO_VERSION 90 +#define LIBGTOP_MINOR_VERSION 40 +#define LIBGTOP_MICRO_VERSION 0 #endif /* LIBGTOPCONFIG_H */ diff --git a/m4/pkg.m4 b/m4/pkg.m4 new file mode 100644 index 00000000..d8549a47 --- /dev/null +++ b/m4/pkg.m4 @@ -0,0 +1,343 @@ +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 11 (pkg-config-0.29.1) + +dnl Copyright © 2004 Scott James Remnant . +dnl Copyright © 2012-2015 Dan Nicholson +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +dnl 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that +dnl program. + +dnl PKG_PREREQ(MIN-VERSION) +dnl ----------------------- +dnl Since: 0.29 +dnl +dnl Verify that the version of the pkg-config macros are at least +dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's +dnl installed version of pkg-config, this checks the developer's version +dnl of pkg.m4 when generating configure. +dnl +dnl To ensure that this macro is defined, also add: +dnl m4_ifndef([PKG_PREREQ], +dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) +dnl +dnl See the "Since" comment for each macro you use to see what version +dnl of the macros you require. +m4_defun([PKG_PREREQ], +[m4_define([PKG_MACROS_VERSION], [0.29.1]) +m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) +])dnl PKG_PREREQ + +dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) +dnl ---------------------------------- +dnl Since: 0.16 +dnl +dnl Search for the pkg-config tool and set the PKG_CONFIG variable to +dnl first found in the path. Checks that the version of pkg-config found +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is +dnl used since that's the first version where most current features of +dnl pkg-config existed. +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + +if test "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 +])dnl PKG_PROG_PKG_CONFIG + +dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------------------------------- +dnl Since: 0.18 +dnl +dnl Check to see whether a particular set of modules exists. Similar to +dnl PKG_CHECK_MODULES(), but does not set variables or print errors. +dnl +dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +dnl only at the first occurence in configure.ac, so if the first place +dnl it's called might be skipped (such as if it is within an "if", you +dnl have to call PKG_CHECK_EXISTS manually +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + +dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +dnl --------------------------------------------- +dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting +dnl pkg_failed based on the result. +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + 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 +])dnl _PKG_CONFIG + +dnl _PKG_SHORT_ERRORS_SUPPORTED +dnl --------------------------- +dnl Internal check to see if pkg-config supports short errors. +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])dnl _PKG_SHORT_ERRORS_SUPPORTED + + +dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl -------------------------------------------------------------- +dnl Since: 0.4.0 +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES might not happen, you should be sure to include an +dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + 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 .])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])dnl PKG_CHECK_MODULES + + +dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl --------------------------------------------------------------------- +dnl Since: 0.29 +dnl +dnl Checks for existence of MODULES and gathers its build flags with +dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +dnl and VARIABLE-PREFIX_LIBS from --libs. +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to +dnl include an explicit call to PKG_PROG_PKG_CONFIG in your +dnl configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +])dnl PKG_CHECK_MODULES_STATIC + + +dnl PKG_INSTALLDIR([DIRECTORY]) +dnl ------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable pkgconfigdir as the location where a module +dnl should install pkg-config .pc files. By default the directory is +dnl $libdir/pkgconfig, but the default can be changed by passing +dnl DIRECTORY. The user can override through the --with-pkgconfigdir +dnl parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +])dnl PKG_INSTALLDIR + + +dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) +dnl -------------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable noarch_pkgconfigdir as the location where a +dnl module should install arch-independent pkg-config .pc files. By +dnl default the directory is $datadir/pkgconfig, but the default can be +dnl changed by passing DIRECTORY. The user can override through the +dnl --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +])dnl PKG_NOARCH_INSTALLDIR + + +dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------- +dnl Since: 0.28 +dnl +dnl Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])dnl PKG_CHECK_VAR + +dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], +dnl [DESCRIPTION], [DEFAULT]) +dnl ------------------------------------------ +dnl +dnl Prepare a "--with-" configure option using the lowercase +dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and +dnl PKG_CHECK_MODULES in a single macro. +AC_DEFUN([PKG_WITH_MODULES], +[ +m4_pushdef([with_arg], m4_tolower([$1])) + +m4_pushdef([description], + [m4_default([$5], [build with ]with_arg[ support])]) + +m4_pushdef([def_arg], [m4_default([$6], [auto])]) +m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes]) +m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no]) + +m4_case(def_arg, + [yes],[m4_pushdef([with_without], [--without-]with_arg)], + [m4_pushdef([with_without],[--with-]with_arg)]) + +AC_ARG_WITH(with_arg, + AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),, + [AS_TR_SH([with_]with_arg)=def_arg]) + +AS_CASE([$AS_TR_SH([with_]with_arg)], + [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)], + [auto],[PKG_CHECK_MODULES([$1],[$2], + [m4_n([def_action_if_found]) $3], + [m4_n([def_action_if_not_found]) $4])]) + +m4_popdef([with_arg]) +m4_popdef([description]) +m4_popdef([def_arg]) + +])dnl PKG_WITH_MODULES + +dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [DESCRIPTION], [DEFAULT]) +dnl ----------------------------------------------- +dnl +dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES +dnl check._[VARIABLE-PREFIX] is exported as make variable. +AC_DEFUN([PKG_HAVE_WITH_MODULES], +[ +PKG_WITH_MODULES([$1],[$2],,,[$3],[$4]) + +AM_CONDITIONAL([HAVE_][$1], + [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"]) +])dnl PKG_HAVE_WITH_MODULES + +dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [DESCRIPTION], [DEFAULT]) +dnl ------------------------------------------------------ +dnl +dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after +dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make +dnl and preprocessor variable. +AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES], +[ +PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4]) + +AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], + [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) +])dnl PKG_HAVE_DEFINE_WITH_MODULES diff --git a/misc/Makefile.in b/misc/Makefile.in index 6bd35ddb..1bbbbfef 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -97,9 +97,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) diff --git a/po/da.gmo b/po/da.gmo index fb4da146..271d0d68 100644 Binary files a/po/da.gmo and b/po/da.gmo differ diff --git a/po/da.po b/po/da.po index 3a31f531..dd5ae047 100644 --- a/po/da.po +++ b/po/da.po @@ -10,12 +10,11 @@ msgid "" msgstr "" "Project-Id-Version: libgtop\n" -"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" -"product=libgtop&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2017-04-07 11:45+0000\n" -"PO-Revision-Date: 2017-09-10 17:51+0200\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libgtop/issues\n" +"POT-Creation-Date: 2018-01-25 10:19+0000\n" +"PO-Revision-Date: 2019-02-14 00:00+0200\n" "Last-Translator: Ole Laursen \n" -"Language-Team: Danish \n" +"Language-Team: Danish \n" "Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -66,7 +65,9 @@ msgstr "Kaldt fra inetd" #: src/daemon/gnuserv.c:498 #, c-format msgid "Run “%s --help” to see a full list of available command line options.\n" -msgstr "Kør “%s --help” for at få en liste over alle tilgængelige kommandolinjetilvalg.\n" +msgstr "" +"Kør “%s --help” for at få en liste over alle tilgængelige " +"kommandolinjetilvalg.\n" #: sysdeps/osf1/siglist.c:27 sysdeps/sun4/siglist.c:27 msgid "Hangup" diff --git a/po/eo.gmo b/po/eo.gmo index b310ffdb..597c78b2 100644 Binary files a/po/eo.gmo and b/po/eo.gmo differ diff --git a/po/eo.po b/po/eo.po index 2ccd808f..42804144 100644 --- a/po/eo.po +++ b/po/eo.po @@ -2,193 +2,193 @@ # Copyright (C) 2006-2011 Free Software Foundation, Inc. # This file is distributed under the same license as the libgtop package. # Dominique PELLE , 2006. -# Kristjan SCHMIDT , 2010, 2011. -# +# Kristjan SCHMIDT , 2010, 2011, 2019. msgid "" msgstr "" "Project-Id-Version: libgtop\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=libgtop&component=general\n" -"POT-Creation-Date: 2011-03-31 17:35+0000\n" -"PO-Revision-Date: 2011-06-08 11:49+0200\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libgtop/issues\n" +"POT-Creation-Date: 2018-01-25 10:19+0000\n" +"PO-Revision-Date: 2019-02-24 12:06+0200\n" "Last-Translator: Kristjan SCHMIDT \n" -"Language-Team: Esperanto \n" +"Language-Team: Esperanto \n" "Language: eo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" -"X-Launchpad-Export-Date: 2011-06-08 09:44+0000\n" -"X-Generator: Launchpad (build 13144)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Virtaal 0.7.1\n" -#: ../lib/read.c:51 +#: lib/read.c:49 #, c-format msgid "read %d byte" msgid_plural "read %d bytes" msgstr[0] "legis %d bajton" msgstr[1] "legis %d bajtojn" -#: ../lib/read_data.c:51 +#: lib/read_data.c:49 msgid "read data size" msgstr "grando de legita datumo" -#: ../lib/read_data.c:70 +#: lib/read_data.c:66 #, c-format msgid "read %lu byte of data" msgid_plural "read %lu bytes of data" msgstr[0] "legis %lu bajton da datumo" msgstr[1] "legis %lu bajtojn da datumo" -#: ../lib/write.c:51 +#: lib/write.c:49 #, c-format msgid "wrote %d byte" msgid_plural "wrote %d bytes" msgstr[0] "skribis %d bajton" msgstr[1] "skribis %d bajtojn" -#: ../src/daemon/gnuserv.c:455 +#: src/daemon/gnuserv.c:456 msgid "Enable debugging" msgstr "Enŝalti sencimigon" -#: ../src/daemon/gnuserv.c:457 +#: src/daemon/gnuserv.c:458 msgid "Enable verbose output" msgstr "Enŝalti babileman eligon" -#: ../src/daemon/gnuserv.c:459 -msgid "Don't fork into background" +#: src/daemon/gnuserv.c:460 +#| msgid "Don't fork into background" +msgid "Don’t fork into background" msgstr "Ne forki fonen" -#: ../src/daemon/gnuserv.c:461 +#: src/daemon/gnuserv.c:462 msgid "Invoked from inetd" msgstr "Alvokita de \"inetd\"" -#: ../src/daemon/gnuserv.c:495 +#: src/daemon/gnuserv.c:498 #, c-format -msgid "Run '%s --help' to see a full list of available command line options.\n" +#| msgid "" +#| "Run '%s --help' to see a full list of available command line options.\n" +msgid "Run “%s --help” to see a full list of available command line options.\n" msgstr "" -"Ruli '%s --help' por vidigi tutan liston de disponeblajn komandliniaj " -"opciojn.\n" +"Ruli “%s --help” por vidi tutan liston de disponeblajn komandliniaj opciojn." +"\n" -#: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27 +#: sysdeps/osf1/siglist.c:27 sysdeps/sun4/siglist.c:27 msgid "Hangup" msgstr "Malkonekti" -#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28 +#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28 msgid "Interrupt" msgstr "Interrompi" -#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29 +#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29 msgid "Quit" msgstr "Ĉesi" -#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30 +#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30 msgid "Illegal instruction" msgstr "Nevalida komando" -#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31 +#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31 msgid "Trace trap" msgstr "Spura escepto" -#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32 +#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32 msgid "Abort" msgstr "Ĉesigi" -#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33 +#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33 msgid "EMT error" msgstr "EMT-eraro" -#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34 +#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34 msgid "Floating-point exception" msgstr "Glitpunkta escepto" -#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35 +#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35 msgid "Kill" msgstr "Mortigi" -#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36 +#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36 msgid "Bus error" msgstr "Bus-eraro" -#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37 +#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37 msgid "Segmentation violation" msgstr "Aliro al nerezervita memoro" -#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38 +#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38 msgid "Bad argument to system call" msgstr "Nevalida argumento al sistemvoko" -#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39 +#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39 msgid "Broken pipe" msgstr "Rompita dukto" -#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40 +#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40 msgid "Alarm clock" msgstr "Alarm-takto" -#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41 +#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41 msgid "Termination" msgstr "Finiĝo" -#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42 +#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42 msgid "Urgent condition on socket" msgstr "Urĝa kondiĉo ĉe kontaktoskatolo" -#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43 +#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43 msgid "Stop" msgstr "Haltigi" -#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44 +#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44 msgid "Keyboard stop" msgstr "Klavara halto" -#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45 +#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45 msgid "Continue" msgstr "Daŭrigi" -#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46 +#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46 msgid "Child status has changed" msgstr "Stato de ido ŝanĝiĝis" -#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47 +#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47 msgid "Background read from tty" -msgstr "Fona lego de \"tty\"" +msgstr "Fona lego de \"tty\"" -#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48 +#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48 msgid "Background write to tty" msgstr "Fona skribo al \"tty\"" -#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49 +#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49 msgid "I/O now possible" msgstr "Eneligo nun eblas" -#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50 +#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50 msgid "CPU limit exceeded" msgstr "Limo de procesilo superitas" -#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51 +#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51 msgid "File size limit exceeded" msgstr "Limo de dosiergrando superitas" -#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52 +#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52 msgid "Virtual alarm clock" msgstr "Virtuala alarm-takto" -#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53 +#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53 msgid "Profiling alarm clock" msgstr "Profila alarm-takto" -#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54 +#: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54 msgid "Window size change" msgstr "Ŝanĝo de fenestrogrando" -#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55 +#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55 msgid "Information request" msgstr "Informpeto" -#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56 +#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56 msgid "User defined signal 1" msgstr "Uzant-difinita signalo 1" -#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57 +#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57 msgid "User defined signal 2" msgstr "Uzant-difinita signalo 2" diff --git a/po/et.gmo b/po/et.gmo index d4ebbb63..d61979fe 100644 Binary files a/po/et.gmo and b/po/et.gmo differ diff --git a/po/et.po b/po/et.po index b3353b06..62b50f7a 100644 --- a/po/et.po +++ b/po/et.po @@ -11,183 +11,184 @@ msgid "" msgstr "" "Project-Id-Version: libgtop HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-14 03:41+0100\n" -"PO-Revision-Date: 2007-05-14 08:09+0300\n" -"Last-Translator: Ivar Smolin \n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libgtop/issues\n" +"POT-Creation-Date: 2018-01-25 10:19+0000\n" +"PO-Revision-Date: 2019-03-10 19:08+0200\n" +"Last-Translator: Mart Raudsepp \n" "Language-Team: Estonian \n" "Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 2.2\n" -#: ../lib/read.c:51 +#: lib/read.c:49 #, c-format msgid "read %d byte" msgid_plural "read %d bytes" msgstr[0] "loetud %d bait" msgstr[1] "loetud %d baiti" -#: ../lib/read_data.c:51 +#: lib/read_data.c:49 msgid "read data size" msgstr "loetud andmete hulk" -#: ../lib/read_data.c:70 +#: lib/read_data.c:66 #, c-format msgid "read %lu byte of data" msgid_plural "read %lu bytes of data" msgstr[0] "loetud %lu bait andmeid" msgstr[1] "loetud %lu baiti andmeid" -#: ../lib/write.c:51 +#: lib/write.c:49 #, c-format msgid "wrote %d byte" msgid_plural "wrote %d bytes" msgstr[0] "kirjutatud %d bait" msgstr[1] "kirjutatud %d baiti" -#: ../src/daemon/gnuserv.c:458 +#: src/daemon/gnuserv.c:456 msgid "Enable debugging" msgstr "Silumise lubamine" -#: ../src/daemon/gnuserv.c:460 +#: src/daemon/gnuserv.c:458 msgid "Enable verbose output" msgstr "Teaberohke väljundi lubamine" -#: ../src/daemon/gnuserv.c:462 -msgid "Don't fork into background" +#: src/daemon/gnuserv.c:460 +msgid "Don’t fork into background" msgstr "Taustale siirdumine keelatud" -#: ../src/daemon/gnuserv.c:464 +#: src/daemon/gnuserv.c:462 msgid "Invoked from inetd" msgstr "Käivitatakse inetd abil" -#: ../src/daemon/gnuserv.c:498 +#: src/daemon/gnuserv.c:498 #, c-format -msgid "Run '%s --help' to see a full list of available command line options.\n" -msgstr "Kõigi käsureavõtmete nimekirja vaatamiseks käivita '%s --help'.\n" +msgid "Run “%s --help” to see a full list of available command line options.\n" +msgstr "Kõigi käsureavõtmete nimekirja vaatamiseks käivita „%s --help“.\n" -#: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27 +#: sysdeps/osf1/siglist.c:27 sysdeps/sun4/siglist.c:27 msgid "Hangup" msgstr "Toru hargilepanek" -#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28 +#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28 msgid "Interrupt" msgstr "Katkestamine" -#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29 +#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29 msgid "Quit" msgstr "Lõpetamine" -#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30 +#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30 msgid "Illegal instruction" msgstr "Lubamatu instruktsioon" -#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31 +#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31 msgid "Trace trap" msgstr "Jälitamispüünis" -#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32 +#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32 msgid "Abort" msgstr "Katkestamine" -#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33 +#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33 msgid "EMT error" msgstr "EMT viga" -#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34 +#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34 msgid "Floating-point exception" msgstr "Ujukomaviga" -#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35 +#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35 msgid "Kill" msgstr "Kõrvaldamine" -#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36 +#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36 msgid "Bus error" msgstr "Siini viga" -#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37 +#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37 msgid "Segmentation violation" msgstr "Segmenteerimisviga" -#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38 +#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38 msgid "Bad argument to system call" msgstr "Vigane süsteemikutsungi argument" -#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39 +#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39 msgid "Broken pipe" msgstr "Katkine toru" -#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40 +#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40 msgid "Alarm clock" msgstr "Alarmkell" -#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41 +#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41 msgid "Termination" msgstr "Lõpetamine" -#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42 +#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42 msgid "Urgent condition on socket" msgstr "Sokli edasilükkamatu seisund" -#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43 +#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43 msgid "Stop" msgstr "Seiskamine" -#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44 +#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44 msgid "Keyboard stop" msgstr "Seiskamine klaviatuurilt" -#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45 +#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45 msgid "Continue" msgstr "Jätkamine" -#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46 +#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46 msgid "Child status has changed" msgstr "Lapsprotsessi olek muudetud" -#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47 +#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47 msgid "Background read from tty" msgstr "Taustalugemine tty'lt" -#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48 +#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48 msgid "Background write to tty" msgstr "Taustakirjutamine tty'le" -#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49 +#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49 msgid "I/O now possible" msgstr "S/V on nüüd võimalik" -#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50 +#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50 msgid "CPU limit exceeded" msgstr "Protsessoriaja piirang ületatud" -#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51 +#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51 msgid "File size limit exceeded" msgstr "Failisuuruse piirang ületatud" -#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52 +#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52 msgid "Virtual alarm clock" msgstr "Virtuaalne alarmkell" -#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53 +#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53 msgid "Profiling alarm clock" msgstr "Alarmkella profileerimine" -#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54 +#: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54 msgid "Window size change" msgstr "Akna suuruse muutmine" -#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55 +#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55 msgid "Information request" msgstr "Teabepäring" -#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56 +#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56 msgid "User defined signal 1" msgstr "Kasutaja kirjeldatud signaal 1" -#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57 +#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57 msgid "User defined signal 2" msgstr "Kasutaja kirjeldatud signaal 2" diff --git a/src/Makefile.in b/src/Makefile.in index c3dbb3c8..3a733bf6 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -97,9 +97,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) diff --git a/src/daemon/Makefile.in b/src/daemon/Makefile.in index 26120843..8cc4e04a 100644 --- a/src/daemon/Makefile.in +++ b/src/daemon/Makefile.in @@ -100,9 +100,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) diff --git a/sysdeps/Makefile.in b/sysdeps/Makefile.in index 1abcafeb..1425433d 100644 --- a/sysdeps/Makefile.in +++ b/sysdeps/Makefile.in @@ -97,9 +97,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) diff --git a/sysdeps/aix/Makefile.in b/sysdeps/aix/Makefile.in index 763c5d6e..bfca26df 100644 --- a/sysdeps/aix/Makefile.in +++ b/sysdeps/aix/Makefile.in @@ -99,9 +99,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(libgtopinclude_HEADERS) \ diff --git a/sysdeps/bsd/Makefile.in b/sysdeps/bsd/Makefile.in index bbdafefc..cd568975 100644 --- a/sysdeps/bsd/Makefile.in +++ b/sysdeps/bsd/Makefile.in @@ -99,9 +99,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(libgtopinclude_HEADERS) \ diff --git a/sysdeps/common/Makefile.in b/sysdeps/common/Makefile.in index 2baa9e88..2f606405 100644 --- a/sysdeps/common/Makefile.in +++ b/sysdeps/common/Makefile.in @@ -98,9 +98,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) diff --git a/sysdeps/cygwin/Makefile.in b/sysdeps/cygwin/Makefile.in index b4305125..fa1ece04 100644 --- a/sysdeps/cygwin/Makefile.in +++ b/sysdeps/cygwin/Makefile.in @@ -99,9 +99,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(libgtopinclude_HEADERS) \ diff --git a/sysdeps/darwin/Makefile.in b/sysdeps/darwin/Makefile.in index d364b186..ed787e36 100644 --- a/sysdeps/darwin/Makefile.in +++ b/sysdeps/darwin/Makefile.in @@ -99,9 +99,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(libgtopinclude_HEADERS) \ diff --git a/sysdeps/freebsd/Makefile.in b/sysdeps/freebsd/Makefile.in index b1dae0ca..92312a66 100644 --- a/sysdeps/freebsd/Makefile.in +++ b/sysdeps/freebsd/Makefile.in @@ -99,9 +99,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(libgtopinclude_HEADERS) \ diff --git a/sysdeps/linux/Makefile.in b/sysdeps/linux/Makefile.in index 82d486f8..e7529646 100644 --- a/sysdeps/linux/Makefile.in +++ b/sysdeps/linux/Makefile.in @@ -99,9 +99,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(libgtopinclude_HEADERS) \ diff --git a/sysdeps/openbsd/Makefile.in b/sysdeps/openbsd/Makefile.in index e5f8c07c..2d05ce08 100644 --- a/sysdeps/openbsd/Makefile.in +++ b/sysdeps/openbsd/Makefile.in @@ -99,9 +99,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(libgtopinclude_HEADERS) \ diff --git a/sysdeps/osf1/Makefile.in b/sysdeps/osf1/Makefile.in index a5f917de..74dc266b 100644 --- a/sysdeps/osf1/Makefile.in +++ b/sysdeps/osf1/Makefile.in @@ -99,9 +99,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(libgtopinclude_HEADERS) \ diff --git a/sysdeps/solaris/Makefile.in b/sysdeps/solaris/Makefile.in index e9fa4e8d..33d76a7a 100644 --- a/sysdeps/solaris/Makefile.in +++ b/sysdeps/solaris/Makefile.in @@ -99,9 +99,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(libgtopinclude_HEADERS) \ diff --git a/sysdeps/stub/Makefile.in b/sysdeps/stub/Makefile.in index 379c28af..6230371a 100644 --- a/sysdeps/stub/Makefile.in +++ b/sysdeps/stub/Makefile.in @@ -99,9 +99,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(libgtopinclude_HEADERS) \ diff --git a/sysdeps/stub_suid/Makefile.in b/sysdeps/stub_suid/Makefile.in index deb4181a..027dc601 100644 --- a/sysdeps/stub_suid/Makefile.in +++ b/sysdeps/stub_suid/Makefile.in @@ -99,9 +99,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(libgtopinclude_HEADERS) \ diff --git a/sysdeps/sun4/Makefile.in b/sysdeps/sun4/Makefile.in index 56c41835..07fe654b 100644 --- a/sysdeps/sun4/Makefile.in +++ b/sysdeps/sun4/Makefile.in @@ -99,9 +99,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(libgtopinclude_HEADERS) \