aboutsummaryrefslogtreecommitdiff
path: root/devel/libgtop
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2009-01-10 05:22:13 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2009-01-10 05:22:13 +0000
commit610ae5681637c1051a0c17b54e29d97f53da2f3a (patch)
treec231a1eb74b07e444fa7363012cb84bf23d83ce0 /devel/libgtop
parent15b6544926b07a98710eeb765baf03e3fc9a195c (diff)
downloadports-610ae5681637c1051a0c17b54e29d97f53da2f3a.tar.gz
ports-610ae5681637c1051a0c17b54e29d97f53da2f3a.zip
Notes
Diffstat (limited to 'devel/libgtop')
-rw-r--r--devel/libgtop/Makefile5
-rw-r--r--devel/libgtop/distinfo6
-rw-r--r--devel/libgtop/files/patch-configure727
-rw-r--r--devel/libgtop/files/patch-libgtop-sysdeps.m49
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_Makefile.am17
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in48
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_fsusage.c61
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_mountlist.c171
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_nosuid.c19
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_open.c91
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_procmap.c36
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c210
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_procwd.c114
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_shm_limits.c22
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_suid_open.c94
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_sysinfo.c13
-rw-r--r--devel/libgtop/pkg-plist5
17 files changed, 694 insertions, 954 deletions
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 1c47ecf8168d..6c7eb0d77fa3 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libgtop/Makefile,v 1.34 2008/03/10 21:59:17 mezz Exp $
+# $MCom: ports/devel/libgtop/Makefile,v 1.45 2009/01/10 01:59:21 mezz Exp $
#
PORTNAME= libgtop
-PORTVERSION= 2.22.3
+PORTVERSION= 2.24.0
+PORTREVISION= 3
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo
index b553cb38b64b..baa6eea845a3 100644
--- a/devel/libgtop/distinfo
+++ b/devel/libgtop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgtop-2.22.3.tar.bz2) = 57764ad246ceb959f601505aa2364f1f
-SHA256 (gnome2/libgtop-2.22.3.tar.bz2) = d6d5a6e4c0c2f956c8b8e876cf3a5213d5364d652d7d14134cb608ad5ae0329a
-SIZE (gnome2/libgtop-2.22.3.tar.bz2) = 776327
+MD5 (gnome2/libgtop-2.24.0.tar.bz2) = f0e3584b9157d3425184a9e21e3ac482
+SHA256 (gnome2/libgtop-2.24.0.tar.bz2) = af9643abf15887c9cb501a4dcc6f432ec0896b7087ef8739526f284ed1461a18
+SIZE (gnome2/libgtop-2.24.0.tar.bz2) = 775351
diff --git a/devel/libgtop/files/patch-configure b/devel/libgtop/files/patch-configure
index baf610abc525..6f9d64a4b82f 100644
--- a/devel/libgtop/files/patch-configure
+++ b/devel/libgtop/files/patch-configure
@@ -1,10 +1,10 @@
---- configure.orig 2008-12-06 16:04:20.000000000 -0500
-+++ configure 2008-12-06 16:04:34.000000000 -0500
+--- configure.orig 2008-12-07 00:14:33.000000000 -0500
++++ configure 2008-12-07 00:14:54.000000000 -0500
@@ -1,11 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.61 for libgtop 2.22.3.
-+# Generated by GNU Autoconf 2.62 for libgtop 2.22.3.
+-# Generated by GNU Autoconf 2.61 for libgtop 2.24.0.
++# Generated by GNU Autoconf 2.62 for libgtop 2.24.0.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop>.
#
@@ -610,7 +610,7 @@
@@ -1691,10 +1785,10 @@ test -n "$ac_init_help" && exit $ac_stat
if $ac_init_version; then
cat <<\_ACEOF
- libgtop configure 2.22.3
+ libgtop configure 2.24.0
-generated by GNU Autoconf 2.61
+generated by GNU Autoconf 2.62
@@ -623,7 +623,7 @@
@@ -1705,7 +1799,7 @@ This file contains any messages produced
running configure, to aid debugging if configure makes a mistake.
- It was created by libgtop $as_me 2.22.3, which was
+ It was created by libgtop $as_me 2.24.0, which was
-generated by GNU Autoconf 2.61. Invocation command line was
+generated by GNU Autoconf 2.62. Invocation command line was
@@ -7833,16 +7833,7 @@
case "$host_os" in
linux*)
-@@ -21523,6 +21766,8 @@ echo $ECHO_N "checking for libgtop sysde
- libgtop_sysdeps_dir=freebsd
- libgtop_use_machine_h=yes
- libgtop_need_server=yes
-+ libgtop_sysdeps_private_mountlist=yes
-+ libgtop_sysdeps_private_fsusage=yes
- libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
- ;;
- solaris*)
-@@ -21576,8 +21821,8 @@ echo $ECHO_N "checking for libgtop sysde
+@@ -21578,8 +21821,8 @@ echo $ECHO_N "checking for libgtop sysde
test -z "$libgtop_postinstall" && libgtop_postinstall=:
@@ -7853,7 +7844,7 @@
-@@ -21587,10 +21832,10 @@ echo "${ECHO_T}$libgtop_sysdeps_dir" >&6
+@@ -21589,10 +21832,10 @@ echo "${ECHO_T}$libgtop_sysdeps_dir" >&6
*bsd*)
case "$host_os" in
*kfreebsd*)
@@ -7867,7 +7858,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lkvm -lfreebsd -lbsd $LIBS"
-@@ -21622,32 +21867,36 @@ case "(($ac_try" in
+@@ -21624,32 +21867,36 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7911,7 +7902,7 @@
if test $ac_cv_lib_kvm_kvm_open = yes; then
KVM_LIBS="-lkvm -lfreebsd -lbsd"
else
-@@ -21655,10 +21904,10 @@ else
+@@ -21657,10 +21904,10 @@ else
fi
;;
*)
@@ -7925,7 +7916,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lkvm $LIBS"
-@@ -21690,32 +21939,36 @@ case "(($ac_try" in
+@@ -21692,32 +21939,36 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -7969,7 +7960,7 @@
if test $ac_cv_lib_kvm_kvm_open = yes; then
KVM_LIBS=-lkvm
else
-@@ -21735,6 +21988,82 @@ fi
+@@ -21737,6 +21988,82 @@ fi
if test -n "${osreldate}" && test ${osreldate} -ge 600000 ; then
EXTRA_SYSDEPS_LIBS="-lgeom -ldevstat"
fi
@@ -8052,7 +8043,7 @@
;;
esac
-@@ -21743,20 +22072,21 @@ fi
+@@ -21745,20 +22072,21 @@ fi
for ac_header in net/if_var.h
do
@@ -8083,7 +8074,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -21772,32 +22102,33 @@ case "(($ac_try" in
+@@ -21774,32 +22102,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8124,7 +8115,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -21811,51 +22142,52 @@ case "(($ac_try" in
+@@ -21813,51 +22142,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8198,7 +8189,7 @@
( cat <<\_ASBOX
## ---------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
-@@ -21864,29 +22196,31 @@ _ASBOX
+@@ -21866,29 +22196,31 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -8240,7 +8231,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -21929,36 +22263,37 @@ case "(($ac_try" in
+@@ -21931,36 +22263,37 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8285,7 +8276,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22003,28 +22338,29 @@ case "(($ac_try" in
+@@ -22005,28 +22338,29 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8320,7 +8311,7 @@
if test x$have_i4b_acct = xyes ; then
cat >>confdefs.h <<\_ACEOF
-@@ -22032,21 +22368,21 @@ cat >>confdefs.h <<\_ACEOF
+@@ -22034,21 +22368,21 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
else
@@ -8347,7 +8338,7 @@
else
msginfo_needs=
for def in nothing KERNEL _KERNEL; do
-@@ -22071,13 +22407,14 @@ case "(($ac_try" in
+@@ -22073,13 +22407,14 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8364,7 +8355,7 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -22100,7 +22437,7 @@ _ACEOF
+@@ -22102,7 +22437,7 @@ _ACEOF
else
@@ -8373,7 +8364,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -22112,11 +22449,11 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -22114,11 +22449,11 @@ rm -f core conftest.err conftest.$ac_obj
fi
@@ -8389,7 +8380,7 @@
{ (exit 1); exit 1; }; }
fi
;;
-@@ -22132,20 +22469,21 @@ echo "$as_me: error: Could not find the
+@@ -22134,20 +22469,21 @@ echo "$as_me: error: Could not find the
for ac_header in linux/version.h
do
@@ -8420,7 +8411,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22161,32 +22499,33 @@ case "(($ac_try" in
+@@ -22163,32 +22499,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8461,7 +8452,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22200,51 +22539,52 @@ case "(($ac_try" in
+@@ -22202,51 +22539,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8535,7 +8526,7 @@
( cat <<\_ASBOX
## ---------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
-@@ -22253,21 +22593,23 @@ _ASBOX
+@@ -22255,21 +22593,23 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -8567,7 +8558,7 @@
_ACEOF
have_linux_version_h=yes
else
-@@ -22286,15 +22628,15 @@ done
+@@ -22288,15 +22628,15 @@ done
os_version_code=`echo "$os_version_expr" | dc`
fi
@@ -8587,7 +8578,7 @@
;;
solaris*)
os_major_version=`uname -r | sed 's/\([0-9]*\).\([0-9]*\)\.*\([0-9]*\)/\1/'`
-@@ -22304,27 +22646,27 @@ echo "${ECHO_T}$os_version_code" >&6; }
+@@ -22306,27 +22646,27 @@ echo "${ECHO_T}$os_version_code" >&6; }
os_version_expr="$os_major_version 10000 * $os_minor_version 100 * + $os_micro_version + p q"
os_version_code=`echo "$os_version_expr" | dc`
@@ -8628,7 +8619,7 @@
if test x$libgtop_need_server = xyes ; then
-@@ -22377,20 +22719,21 @@ fi
+@@ -22379,20 +22719,21 @@ fi
for ac_header in sys/bitypes.h
do
@@ -8659,7 +8650,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22406,32 +22749,33 @@ case "(($ac_try" in
+@@ -22408,32 +22749,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8700,7 +8691,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22445,51 +22789,52 @@ case "(($ac_try" in
+@@ -22447,51 +22789,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -8774,7 +8765,7 @@
( cat <<\_ASBOX
## ---------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
-@@ -22498,21 +22843,23 @@ _ASBOX
+@@ -22500,21 +22843,23 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -8806,7 +8797,7 @@
_ACEOF
fi
-@@ -22529,10 +22876,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" !=
+@@ -22531,10 +22876,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" !=
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
@@ -8820,7 +8811,7 @@
else
case $PKG_CONFIG in
[\\/]* | ?:[\\/]*)
-@@ -22547,7 +22894,7 @@ do
+@@ -22549,7 +22894,7 @@ do
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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
@@ -8829,7 +8820,7 @@
break 2
fi
done
-@@ -22559,11 +22906,11 @@ esac
+@@ -22561,11 +22906,11 @@ esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -8845,7 +8836,7 @@
fi
-@@ -22572,10 +22919,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
+@@ -22574,10 +22919,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -8859,7 +8850,7 @@
else
case $ac_pt_PKG_CONFIG in
[\\/]* | ?:[\\/]*)
-@@ -22590,7 +22937,7 @@ do
+@@ -22592,7 +22937,7 @@ do
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_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
@@ -8868,7 +8859,7 @@
break 2
fi
done
-@@ -22602,11 +22949,11 @@ esac
+@@ -22604,11 +22949,11 @@ esac
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -8884,7 +8875,7 @@
fi
if test "x$ac_pt_PKG_CONFIG" = x; then
-@@ -22614,10 +22961,10 @@ fi
+@@ -22616,10 +22961,10 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8897,7 +8888,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf@gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -22631,32 +22978,32 @@ fi
+@@ -22633,32 +22978,32 @@ fi
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -8940,7 +8931,7 @@
(exit $ac_status); }; then
pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED" 2>/dev/null`
else
-@@ -22671,10 +23018,10 @@ if test -n "$PKG_CONFIG"; then
+@@ -22673,10 +23018,10 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_GLIB_LIBS="$GLIB_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -8953,7 +8944,7 @@
(exit $ac_status); }; then
pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED" 2>/dev/null`
else
-@@ -22702,7 +23049,7 @@ fi
+@@ -22704,7 +23049,7 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$GLIB_PKG_ERRORS" >&5
@@ -8962,7 +8953,7 @@
$GLIB_PKG_ERRORS
-@@ -22713,7 +23060,7 @@ Alternatively, you may set the environme
+@@ -22715,7 +23060,7 @@ Alternatively, you may set the environme
and GLIB_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
@@ -8971,7 +8962,7 @@
$GLIB_PKG_ERRORS
-@@ -22726,7 +23073,7 @@ See the pkg-config man page for more det
+@@ -22728,7 +23073,7 @@ See the pkg-config man page for more det
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -8980,7 +8971,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -22736,7 +23083,7 @@ See the pkg-config man page for more det
+@@ -22738,7 +23083,7 @@ See the pkg-config man page for more det
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
@@ -8989,7 +8980,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -22750,25 +23097,25 @@ See \`config.log' for more details." >&2
+@@ -22752,25 +23097,25 @@ See \`config.log' for more details." >&2
else
GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
GLIB_LIBS=$pkg_cv_GLIB_LIBS
@@ -9024,7 +9015,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22784,32 +23131,33 @@ case "(($ac_try" in
+@@ -22786,32 +23131,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9065,7 +9056,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22823,51 +23171,52 @@ case "(($ac_try" in
+@@ -22825,51 +23171,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9139,7 +9130,7 @@
( cat <<\_ASBOX
## ---------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
-@@ -22876,15 +23225,15 @@ _ASBOX
+@@ -22878,15 +23225,15 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -9160,7 +9151,7 @@
fi
if test $ac_cv_header_ifaddrs_h = yes; then
-@@ -22902,10 +23251,10 @@ _ACEOF
+@@ -22904,10 +23251,10 @@ _ACEOF
fi
@@ -9174,7 +9165,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -22977,20 +23326,21 @@ case "(($ac_try" in
+@@ -22979,20 +23326,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9199,7 +9190,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_c_const=no
-@@ -22998,20 +23348,20 @@ fi
+@@ -23000,20 +23348,20 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -9226,7 +9217,7 @@
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
-@@ -23034,20 +23384,21 @@ case "(($ac_try" in
+@@ -23036,20 +23384,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9251,7 +9242,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -23058,8 +23409,8 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -23060,8 +23409,8 @@ rm -f core conftest.err conftest.$ac_obj
done
fi
@@ -9262,7 +9253,7 @@
case $ac_cv_c_inline in
-@@ -23077,26 +23428,58 @@ _ACEOF
+@@ -23079,26 +23428,58 @@ _ACEOF
;;
esac
@@ -9329,7 +9320,7 @@
;
return 0;
}
-@@ -23107,29 +23490,38 @@ case "(($ac_try" in
+@@ -23109,29 +23490,38 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9375,7 +9366,7 @@
if test $ac_cv_type_off_t = yes; then
:
else
-@@ -23140,26 +23532,58 @@ _ACEOF
+@@ -23142,26 +23532,58 @@ _ACEOF
fi
@@ -9442,7 +9433,7 @@
;
return 0;
}
-@@ -23170,29 +23594,38 @@ case "(($ac_try" in
+@@ -23172,29 +23594,38 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9488,7 +9479,7 @@
if test $ac_cv_type_pid_t = yes; then
:
else
-@@ -23203,26 +23636,58 @@ _ACEOF
+@@ -23205,26 +23636,58 @@ _ACEOF
fi
@@ -9555,7 +9546,7 @@
;
return 0;
}
-@@ -23233,29 +23698,38 @@ case "(($ac_try" in
+@@ -23235,29 +23698,38 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9601,7 +9592,7 @@
if test $ac_cv_type_size_t = yes; then
:
else
-@@ -23266,10 +23740,10 @@ _ACEOF
+@@ -23268,10 +23740,10 @@ _ACEOF
fi
@@ -9615,7 +9606,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -23294,20 +23768,21 @@ case "(($ac_try" in
+@@ -23296,20 +23768,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9640,7 +9631,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-@@ -23333,20 +23808,21 @@ case "(($ac_try" in
+@@ -23335,20 +23808,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9665,7 +9656,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_member_struct_stat_st_rdev=no
-@@ -23357,8 +23833,8 @@ fi
+@@ -23359,8 +23833,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -9676,7 +9667,7 @@
if test $ac_cv_member_struct_stat_st_rdev = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -23373,10 +23849,10 @@ _ACEOF
+@@ -23375,10 +23849,10 @@ _ACEOF
fi
@@ -9690,7 +9681,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -23403,20 +23879,21 @@ case "(($ac_try" in
+@@ -23405,20 +23879,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9715,7 +9706,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_header_time=no
-@@ -23424,8 +23901,8 @@ fi
+@@ -23426,8 +23901,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -9726,7 +9717,7 @@
if test $ac_cv_header_time = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -23434,10 +23911,10 @@ _ACEOF
+@@ -23436,10 +23911,10 @@ _ACEOF
fi
@@ -9740,7 +9731,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -23453,7 +23930,7 @@ main ()
+@@ -23455,7 +23930,7 @@ main ()
{
struct tm tm;
int *p = &tm.tm_sec;
@@ -9749,7 +9740,7 @@
;
return 0;
}
-@@ -23464,20 +23941,21 @@ case "(($ac_try" in
+@@ -23466,20 +23941,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9774,7 +9765,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_struct_tm=sys/time.h
-@@ -23485,8 +23963,8 @@ fi
+@@ -23487,8 +23963,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -9785,7 +9776,7 @@
if test $ac_cv_struct_tm = sys/time.h; then
cat >>confdefs.h <<\_ACEOF
-@@ -23495,10 +23973,10 @@ _ACEOF
+@@ -23497,10 +23973,10 @@ _ACEOF
fi
@@ -9799,7 +9790,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -23518,8 +23996,8 @@ fi
+@@ -23520,8 +23996,8 @@ fi
rm -f conftest*
fi
@@ -9810,7 +9801,7 @@
if test $ac_cv_type_uid_t = no; then
cat >>confdefs.h <<\_ACEOF
-@@ -23534,26 +24012,58 @@ _ACEOF
+@@ -23536,26 +24012,58 @@ _ACEOF
fi
@@ -9877,7 +9868,7 @@
;
return 0;
}
-@@ -23564,29 +24074,38 @@ case "(($ac_try" in
+@@ -23566,29 +24074,38 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9897,20 +9888,20 @@
} && test -s conftest.$ac_objext; then
- ac_cv_type_ssize_t=yes
+ :
-+else
-+ $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_cv_type_ssize_t=yes
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_type_ssize_t=no
++ ac_cv_type_ssize_t=yes
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++else
++ $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+
fi
@@ -9923,7 +9914,7 @@
if test $ac_cv_type_ssize_t = yes; then
:
else
-@@ -23600,20 +24119,21 @@ fi
+@@ -23602,20 +24119,21 @@ fi
for ac_header in memory.h
do
@@ -9954,7 +9945,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23629,32 +24149,33 @@ case "(($ac_try" in
+@@ -23631,32 +24149,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -9995,7 +9986,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23668,51 +24189,52 @@ case "(($ac_try" in
+@@ -23670,51 +24189,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10069,7 +10060,7 @@
( cat <<\_ASBOX
## ---------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
-@@ -23721,21 +24243,23 @@ _ASBOX
+@@ -23723,21 +24243,23 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -10101,7 +10092,7 @@
_ACEOF
fi
-@@ -23746,20 +24270,21 @@ done
+@@ -23748,20 +24270,21 @@ done
for ac_header in string.h strings.h
do
@@ -10132,7 +10123,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23775,32 +24300,33 @@ case "(($ac_try" in
+@@ -23777,32 +24300,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10173,7 +10164,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23814,51 +24340,52 @@ case "(($ac_try" in
+@@ -23816,51 +24340,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10247,7 +10238,7 @@
( cat <<\_ASBOX
## ---------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
-@@ -23867,21 +24394,23 @@ _ASBOX
+@@ -23869,21 +24394,23 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -10279,7 +10270,7 @@
_ACEOF
break
fi
-@@ -23891,11 +24420,11 @@ done
+@@ -23893,11 +24420,11 @@ done
for ac_func in strerror
do
@@ -10295,7 +10286,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -23948,35 +24477,41 @@ case "(($ac_try" in
+@@ -23950,35 +24477,41 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10347,7 +10338,7 @@
_ACEOF
else
-@@ -23995,11 +24530,11 @@ DL_LIB=
+@@ -23997,11 +24530,11 @@ DL_LIB=
for ac_func in dlopen
do
@@ -10363,7 +10354,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -24052,43 +24587,49 @@ case "(($ac_try" in
+@@ -24054,43 +24587,49 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10426,7 +10417,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
-@@ -24120,40 +24661,44 @@ case "(($ac_try" in
+@@ -24122,40 +24661,44 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10481,7 +10472,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
-@@ -24185,32 +24730,36 @@ case "(($ac_try" in
+@@ -24187,32 +24730,36 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10525,7 +10516,7 @@
if test $ac_cv_lib_dld_shl_load = yes; then
DL_LIB="-ldld"
else
-@@ -24218,11 +24767,11 @@ else
+@@ -24220,11 +24767,11 @@ else
for ac_func in dlopen
do
@@ -10541,7 +10532,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -24275,35 +24824,41 @@ case "(($ac_try" in
+@@ -24277,35 +24824,41 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10593,7 +10584,7 @@
_ACEOF
DL_LIB=""
else
-@@ -24326,11 +24881,11 @@ LIBS="$LIBS $DL_LIB"
+@@ -24328,11 +24881,11 @@ LIBS="$LIBS $DL_LIB"
for ac_func in dlerror
do
@@ -10609,7 +10600,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -24383,35 +24938,41 @@ case "(($ac_try" in
+@@ -24385,35 +24938,41 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10661,7 +10652,7 @@
_ACEOF
fi
-@@ -24421,17 +24982,17 @@ LIBS="$oLIBS"
+@@ -24423,17 +24982,17 @@ LIBS="$oLIBS"
if test "${ac_cv_header_linux_isdn_h+set}" = set; then
@@ -10686,7 +10677,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24447,32 +25008,33 @@ case "(($ac_try" in
+@@ -24449,32 +25008,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10727,7 +10718,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24486,51 +25048,52 @@ case "(($ac_try" in
+@@ -24488,51 +25048,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10801,7 +10792,7 @@
( cat <<\_ASBOX
## ---------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
-@@ -24539,15 +25102,15 @@ _ASBOX
+@@ -24541,15 +25102,15 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -10822,7 +10813,7 @@
fi
if test $ac_cv_header_linux_isdn_h = yes; then
-@@ -24565,10 +25128,10 @@ _ACEOF
+@@ -24567,10 +25128,10 @@ _ACEOF
fi
@@ -10836,7 +10827,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lperfstat $LIBS"
-@@ -24600,32 +25163,36 @@ case "(($ac_try" in
+@@ -24602,32 +25163,36 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10880,7 +10871,7 @@
if test $ac_cv_lib_perfstat_vmgetinfo = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -24638,10 +25205,10 @@ fi
+@@ -24640,10 +25205,10 @@ fi
case "$host_os" in
solaris*)
@@ -10894,7 +10885,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lkstat $LIBS"
-@@ -24673,32 +25240,36 @@ case "(($ac_try" in
+@@ -24675,32 +25240,36 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -10938,7 +10929,7 @@
if test $ac_cv_lib_kstat_kstat_open = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBKSTAT 1
-@@ -24712,11 +25283,11 @@ fi
+@@ -24714,11 +25283,11 @@ fi
for ac_func in getloadavg swapctl
do
@@ -10954,7 +10945,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -24769,35 +25340,41 @@ case "(($ac_try" in
+@@ -24771,35 +25340,41 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11006,7 +10997,7 @@
_ACEOF
fi
-@@ -24807,20 +25384,21 @@ done
+@@ -24809,20 +25384,21 @@ done
for ac_header in procfs.h sys/procfs.h
do
@@ -11037,7 +11028,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24836,32 +25414,33 @@ case "(($ac_try" in
+@@ -24838,32 +25414,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11078,7 +11069,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24875,51 +25454,52 @@ case "(($ac_try" in
+@@ -24877,51 +25454,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11152,7 +11143,7 @@
( cat <<\_ASBOX
## ---------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
-@@ -24928,21 +25508,23 @@ _ASBOX
+@@ -24930,21 +25508,23 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -11184,7 +11175,7 @@
_ACEOF
break
fi
-@@ -24953,10 +25535,10 @@ done
+@@ -24955,10 +25535,10 @@ done
case $host_os in
solaris[8-9] | solaris2.[0-9].*)
@@ -11198,7 +11189,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lkvm $LIBS"
-@@ -24988,41 +25570,45 @@ case "(($ac_try" in
+@@ -24990,41 +25570,45 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11254,7 +11245,7 @@
else
ac_save_LIBS="$LIBS"
LIBS="-lkvm -lelf $LIBS"
-@@ -25047,26 +25633,30 @@ case "(($ac_try" in
+@@ -25049,26 +25633,30 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11290,7 +11281,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
-@@ -25074,12 +25664,12 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -25076,12 +25664,12 @@ rm -f core conftest.err conftest.$ac_obj
fi
if test "$ac_cv_lib_kvm_with_elf" = "yes"; then
@@ -11307,7 +11298,7 @@
fi
fi
-@@ -25090,10 +25680,10 @@ fi
+@@ -25092,10 +25680,10 @@ fi
esac
@@ -11321,7 +11312,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lmach $LIBS"
-@@ -25125,32 +25715,36 @@ case "(($ac_try" in
+@@ -25127,32 +25715,36 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11365,7 +11356,7 @@
if test $ac_cv_lib_mach_vm_statistics = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBMACH 1
-@@ -25163,10 +25757,10 @@ fi
+@@ -25165,10 +25757,10 @@ fi
saved_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -D_GNU_SOURCE"
@@ -11379,7 +11370,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -25209,20 +25803,21 @@ case "(($ac_try" in
+@@ -25211,20 +25803,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11404,7 +11395,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
eval "gcc_cv_decl_needed_program_invocation_name=yes"
-@@ -25232,8 +25827,8 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -25234,8 +25827,8 @@ rm -f core conftest.err conftest.$ac_obj
fi
if eval "test \"`echo '$gcc_cv_decl_needed_'program_invocation_name`\" = yes"; then
@@ -11415,7 +11406,7 @@
gcc_need_declarations="$gcc_need_declarations program_invocation_name"
gcc_tr_decl=NEED_DECLARATION_`echo program_invocation_name | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-@@ -25242,17 +25837,17 @@ cat >>confdefs.h <<_ACEOF
+@@ -25244,17 +25837,17 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
else
@@ -11438,7 +11429,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -25305,44 +25900,48 @@ case "(($ac_try" in
+@@ -25307,44 +25900,48 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11501,7 +11492,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25358,32 +25957,33 @@ case "(($ac_try" in
+@@ -25360,32 +25957,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11542,7 +11533,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25397,51 +25997,52 @@ case "(($ac_try" in
+@@ -25399,51 +25997,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11616,7 +11607,7 @@
( cat <<\_ASBOX
## ---------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
-@@ -25450,30 +26051,30 @@ _ASBOX
+@@ -25452,30 +26051,30 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -11659,7 +11650,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25489,32 +26090,33 @@ case "(($ac_try" in
+@@ -25491,32 +26090,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11700,7 +11691,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25528,51 +26130,52 @@ case "(($ac_try" in
+@@ -25530,51 +26130,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11774,7 +11765,7 @@
( cat <<\_ASBOX
## ---------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
-@@ -25581,15 +26184,15 @@ _ASBOX
+@@ -25583,15 +26184,15 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -11795,7 +11786,7 @@
fi
if test $ac_cv_header_arpa_inet_h = yes; then
-@@ -25599,8 +26202,8 @@ cat >>confdefs.h <<\_ACEOF
+@@ -25601,8 +26202,8 @@ cat >>confdefs.h <<\_ACEOF
#define HAVE_SOCKETS 1
_ACEOF
@@ -11806,7 +11797,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25626,32 +26229,36 @@ case "(($ac_try" in
+@@ -25628,32 +26229,36 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11852,7 +11843,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -25665,10 +26272,10 @@ fi
+@@ -25667,10 +26272,10 @@ fi
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
@@ -11866,7 +11857,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -25692,31 +26299,35 @@ case "(($ac_try" in
+@@ -25694,31 +26299,35 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11909,7 +11900,7 @@
if test $ac_cv_working_alloca_h = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -25725,10 +26336,10 @@ _ACEOF
+@@ -25727,10 +26336,10 @@ _ACEOF
fi
@@ -11923,7 +11914,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -25772,31 +26383,35 @@ case "(($ac_try" in
+@@ -25774,31 +26383,35 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -11966,7 +11957,7 @@
if test $ac_cv_func_alloca_works = yes; then
-@@ -25817,10 +26432,10 @@ cat >>confdefs.h <<\_ACEOF
+@@ -25819,10 +26432,10 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
@@ -11980,7 +11971,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -25844,15 +26459,15 @@ fi
+@@ -25846,15 +26459,15 @@ fi
rm -f conftest*
fi
@@ -12002,7 +11993,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -25905,33 +26520,39 @@ case "(($ac_try" in
+@@ -25907,33 +26520,39 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12051,7 +12042,7 @@
cat >>confdefs.h <<_ACEOF
#define CRAY_STACKSEG_END $ac_func
-@@ -25943,10 +26564,10 @@ fi
+@@ -25945,10 +26564,10 @@ fi
done
fi
@@ -12065,7 +12056,7 @@
else
if test "$cross_compiling" = yes; then
ac_cv_c_stack_direction=0
-@@ -25984,36 +26605,39 @@ case "(($ac_try" in
+@@ -25986,36 +26605,39 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12113,7 +12104,7 @@
cat >>confdefs.h <<_ACEOF
#define STACK_DIRECTION $ac_cv_c_stack_direction
-@@ -26026,20 +26650,21 @@ fi
+@@ -26028,20 +26650,21 @@ fi
for ac_header in stdlib.h unistd.h
do
@@ -12144,7 +12135,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26055,32 +26680,33 @@ case "(($ac_try" in
+@@ -26057,32 +26680,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12185,7 +12176,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26094,51 +26720,52 @@ case "(($ac_try" in
+@@ -26096,51 +26720,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12259,7 +12250,7 @@
( cat <<\_ASBOX
## ---------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
-@@ -26147,21 +26774,23 @@ _ASBOX
+@@ -26149,21 +26774,23 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -12291,7 +12282,7 @@
_ACEOF
fi
-@@ -26171,11 +26800,11 @@ done
+@@ -26173,11 +26800,11 @@ done
for ac_func in getpagesize
do
@@ -12307,7 +12298,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -26228,44 +26857,50 @@ case "(($ac_try" in
+@@ -26230,44 +26857,50 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12371,7 +12362,7 @@
else
if test "$cross_compiling" = yes; then
ac_cv_func_mmap_fixed_mapped=no
-@@ -26409,36 +27044,39 @@ case "(($ac_try" in
+@@ -26411,36 +27044,39 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12419,7 +12410,7 @@
if test $ac_cv_func_mmap_fixed_mapped = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -26448,10 +27086,10 @@ _ACEOF
+@@ -26450,10 +27086,10 @@ _ACEOF
fi
rm -f conftest.mmap
@@ -12433,7 +12424,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -26476,20 +27114,21 @@ case "(($ac_try" in
+@@ -26478,20 +27114,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12458,7 +12449,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_type_signal=void
-@@ -26497,8 +27136,8 @@ fi
+@@ -26499,8 +27136,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -12469,7 +12460,7 @@
cat >>confdefs.h <<_ACEOF
#define RETSIGTYPE $ac_cv_type_signal
-@@ -26508,11 +27147,11 @@ _ACEOF
+@@ -26510,11 +27147,11 @@ _ACEOF
for ac_func in strftime
do
@@ -12485,7 +12476,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -26565,43 +27204,49 @@ case "(($ac_try" in
+@@ -26567,43 +27204,49 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12548,7 +12539,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl $LIBS"
-@@ -26633,32 +27278,36 @@ case "(($ac_try" in
+@@ -26635,32 +27278,36 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12592,7 +12583,7 @@
if test $ac_cv_lib_intl_strftime = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_STRFTIME 1
-@@ -26679,11 +27328,11 @@ done
+@@ -26681,11 +27328,11 @@ done
for ac_func in getcwd gettimeofday getwd putenv strdup strtoul uname
do
@@ -12608,7 +12599,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -26736,35 +27385,41 @@ case "(($ac_try" in
+@@ -26738,35 +27385,41 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12660,7 +12651,7 @@
_ACEOF
fi
-@@ -26774,8 +27429,8 @@ done
+@@ -26776,8 +27429,8 @@ done
case "$am__api_version" in
1.01234)
@@ -12671,7 +12662,7 @@
{ (exit 1); exit 1; }; }
;;
*)
-@@ -26783,27 +27438,27 @@ echo "$as_me: error: Automake 1.5 or new
+@@ -26785,27 +27438,27 @@ echo "$as_me: error: Automake 1.5 or new
esac
if test -n "0.35.0"; then
@@ -12708,7 +12699,7 @@
else
case $INTLTOOL_UPDATE in
[\\/]* | ?:[\\/]*)
-@@ -26818,7 +27473,7 @@ do
+@@ -26820,7 +27473,7 @@ do
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_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
@@ -12717,7 +12708,7 @@
break 2
fi
done
-@@ -26830,20 +27485,20 @@ esac
+@@ -26832,20 +27485,20 @@ esac
fi
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
if test -n "$INTLTOOL_UPDATE"; then
@@ -12745,7 +12736,7 @@
else
case $INTLTOOL_MERGE in
[\\/]* | ?:[\\/]*)
-@@ -26858,7 +27513,7 @@ do
+@@ -26860,7 +27513,7 @@ do
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_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
@@ -12754,7 +12745,7 @@
break 2
fi
done
-@@ -26870,20 +27525,20 @@ esac
+@@ -26872,20 +27525,20 @@ esac
fi
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
if test -n "$INTLTOOL_MERGE"; then
@@ -12782,7 +12773,7 @@
else
case $INTLTOOL_EXTRACT in
[\\/]* | ?:[\\/]*)
-@@ -26898,7 +27553,7 @@ do
+@@ -26900,7 +27553,7 @@ do
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_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
@@ -12791,7 +12782,7 @@
break 2
fi
done
-@@ -26910,17 +27565,17 @@ esac
+@@ -26912,17 +27565,17 @@ esac
fi
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
if test -n "$INTLTOOL_EXTRACT"; then
@@ -12815,7 +12806,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -26967,10 +27622,10 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
+@@ -26969,10 +27622,10 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
# Check the gettext tools to make sure they are GNU
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -12829,7 +12820,7 @@
else
case $XGETTEXT in
[\\/]* | ?:[\\/]*)
-@@ -26985,7 +27640,7 @@ do
+@@ -26987,7 +27640,7 @@ do
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_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
@@ -12838,7 +12829,7 @@
break 2
fi
done
-@@ -26997,20 +27652,20 @@ esac
+@@ -26999,20 +27652,20 @@ esac
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
@@ -12866,7 +12857,7 @@
else
case $MSGMERGE in
[\\/]* | ?:[\\/]*)
-@@ -27025,7 +27680,7 @@ do
+@@ -27027,7 +27680,7 @@ do
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_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
@@ -12875,7 +12866,7 @@
break 2
fi
done
-@@ -27037,20 +27692,20 @@ esac
+@@ -27039,20 +27692,20 @@ esac
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
@@ -12903,7 +12894,7 @@
else
case $MSGFMT in
[\\/]* | ?:[\\/]*)
-@@ -27065,7 +27720,7 @@ do
+@@ -27067,7 +27720,7 @@ do
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_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
@@ -12912,7 +12903,7 @@
break 2
fi
done
-@@ -27077,34 +27732,34 @@ esac
+@@ -27079,34 +27732,34 @@ esac
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
@@ -12958,7 +12949,7 @@
else
case $INTLTOOL_PERL in
[\\/]* | ?:[\\/]*)
-@@ -27119,7 +27774,7 @@ do
+@@ -27121,7 +27774,7 @@ do
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_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
@@ -12967,7 +12958,7 @@
break 2
fi
done
-@@ -27131,33 +27786,33 @@ esac
+@@ -27133,33 +27786,33 @@ esac
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
@@ -13015,7 +13006,7 @@
{ (exit 1); exit 1; }; }
fi
fi
-@@ -27190,29 +27845,32 @@ case "(($ac_try" in
+@@ -27192,29 +27845,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13056,7 +13047,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -27265,44 +27923,49 @@ case "(($ac_try" in
+@@ -27267,44 +27923,49 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13115,7 +13106,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -27324,20 +27987,21 @@ _ACEOF
+@@ -27326,20 +27987,21 @@ _ACEOF
for ac_header in locale.h
do
@@ -13146,7 +13137,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27353,32 +28017,33 @@ case "(($ac_try" in
+@@ -27355,32 +28017,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13187,7 +13178,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27392,51 +28057,52 @@ case "(($ac_try" in
+@@ -27394,51 +28057,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13261,7 +13252,7 @@
( cat <<\_ASBOX
## ---------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
-@@ -27445,21 +28111,23 @@ _ASBOX
+@@ -27447,21 +28111,23 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -13293,7 +13284,7 @@
_ACEOF
fi
-@@ -27467,10 +28135,10 @@ fi
+@@ -27469,10 +28135,10 @@ fi
done
if test $ac_cv_header_locale_h = yes; then
@@ -13307,7 +13298,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -27493,31 +28161,35 @@ case "(($ac_try" in
+@@ -27495,31 +28161,35 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13350,7 +13341,7 @@
if test $am_cv_val_LC_MESSAGES = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -27536,17 +28208,17 @@ _ACEOF
+@@ -27538,17 +28208,17 @@ _ACEOF
INTLLIBS=
if test "${ac_cv_header_libintl_h+set}" = set; then
@@ -13375,7 +13366,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27562,32 +28234,33 @@ case "(($ac_try" in
+@@ -27564,32 +28234,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13416,7 +13407,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27601,51 +28274,52 @@ case "(($ac_try" in
+@@ -27603,51 +28274,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13490,7 +13481,7 @@
( cat <<\_ASBOX
## ---------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
-@@ -27654,15 +28328,15 @@ _ASBOX
+@@ -27656,15 +28328,15 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -13511,7 +13502,7 @@
fi
if test $ac_cv_header_libintl_h = yes; then
-@@ -27672,10 +28346,10 @@ if test $ac_cv_header_libintl_h = yes; t
+@@ -27674,10 +28346,10 @@ if test $ac_cv_header_libintl_h = yes; t
#
# First check in libc
#
@@ -13525,7 +13516,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -27700,38 +28374,42 @@ case "(($ac_try" in
+@@ -27702,38 +28374,42 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13578,7 +13569,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -27756,43 +28434,47 @@ case "(($ac_try" in
+@@ -27758,43 +28434,47 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13637,7 +13628,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -27845,35 +28527,41 @@ case "(($ac_try" in
+@@ -27847,35 +28527,41 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13689,7 +13680,7 @@
_ACEOF
fi
-@@ -27888,10 +28576,10 @@ done
+@@ -27890,10 +28576,10 @@ done
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
@@ -13703,7 +13694,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl $LIBS"
-@@ -27923,37 +28611,41 @@ case "(($ac_try" in
+@@ -27925,37 +28611,41 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13755,7 +13746,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl $LIBS"
-@@ -27985,37 +28677,41 @@ case "(($ac_try" in
+@@ -27987,37 +28677,41 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13807,7 +13798,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl $LIBS"
-@@ -28047,32 +28743,36 @@ case "(($ac_try" in
+@@ -28049,32 +28743,36 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13851,7 +13842,7 @@
if test $ac_cv_lib_intl_dgettext = yes; then
gt_cv_func_dgettext_libintl=yes
fi
-@@ -28083,14 +28783,14 @@ fi
+@@ -28085,14 +28783,14 @@ fi
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -13873,7 +13864,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl -liconv $LIBS"
-@@ -28122,37 +28822,41 @@ case "(($ac_try" in
+@@ -28124,37 +28822,41 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13925,7 +13916,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl -liconv $LIBS"
-@@ -28184,32 +28888,36 @@ case "(($ac_try" in
+@@ -28186,32 +28888,36 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13969,7 +13960,7 @@
if test $ac_cv_lib_intl_dcgettext = yes; then
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
-@@ -28235,11 +28943,11 @@ fi
+@@ -28237,11 +28943,11 @@ fi
for ac_func in bind_textdomain_codeset
do
@@ -13985,7 +13976,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -28292,35 +29000,41 @@ case "(($ac_try" in
+@@ -28294,35 +29000,41 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14037,7 +14028,7 @@
_ACEOF
fi
-@@ -28356,10 +29070,10 @@ _ACEOF
+@@ -28358,10 +29070,10 @@ _ACEOF
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
@@ -14051,7 +14042,7 @@
else
case "$MSGFMT" in
/*)
-@@ -28383,11 +29097,11 @@ esac
+@@ -28385,11 +29097,11 @@ esac
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
@@ -14067,7 +14058,7 @@
fi
if test "$MSGFMT" != "no"; then
glib_save_LIBS="$LIBS"
-@@ -28395,11 +29109,11 @@ fi
+@@ -28397,11 +29109,11 @@ fi
for ac_func in dcgettext
do
@@ -14083,7 +14074,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -28452,43 +29166,49 @@ case "(($ac_try" in
+@@ -28454,43 +29166,49 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14145,7 +14136,7 @@
cat >conftest.foo <<_ACEOF
msgid ""
-@@ -28502,25 +29222,25 @@ msgstr ""
+@@ -28504,25 +29222,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -14180,7 +14171,7 @@
else
case $GMSGFMT in
[\\/]* | ?:[\\/]*)
-@@ -28535,7 +29255,7 @@ do
+@@ -28537,7 +29255,7 @@ do
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_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
@@ -14189,7 +14180,7 @@
break 2
fi
done
-@@ -28548,20 +29268,20 @@ esac
+@@ -28550,20 +29268,20 @@ esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -14217,7 +14208,7 @@
else
case "$XGETTEXT" in
/*)
-@@ -28585,11 +29305,11 @@ esac
+@@ -28587,11 +29305,11 @@ esac
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -14233,7 +14224,7 @@
fi
cat >conftest.$ac_ext <<_ACEOF
-@@ -28614,30 +29334,33 @@ case "(($ac_try" in
+@@ -28616,30 +29334,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14275,7 +14266,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -28690,47 +29413,52 @@ case "(($ac_try" in
+@@ -28692,47 +29413,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14337,7 +14328,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$glib_save_LIBS"
-@@ -28756,8 +29484,8 @@ _ACEOF
+@@ -28758,8 +29484,8 @@ _ACEOF
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -14348,7 +14339,7 @@
XGETTEXT=":"
fi
fi
-@@ -28789,8 +29517,8 @@ echo "${ECHO_T}found xgettext program is
+@@ -28791,8 +29517,8 @@ echo "${ECHO_T}found xgettext program is
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -14359,7 +14350,7 @@
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
useit=no
-@@ -28814,8 +29542,8 @@ echo $ECHO_N "checking for catalogs to b
+@@ -28816,8 +29542,8 @@ echo $ECHO_N "checking for catalogs to b
fi
done
LINGUAS=$NEW_LINGUAS
@@ -14370,7 +14361,7 @@
fi
if test -n "$LINGUAS"; then
-@@ -28853,7 +29581,7 @@ test "x$prefix" = xNONE && prefix=$ac_de
+@@ -28855,7 +29581,7 @@ test "x$prefix" = xNONE && prefix=$ac_de
test "x$exec_prefix" = xNONE && exec_prefix=$prefix
datarootdir=`eval echo "${datarootdir}"`
if test "x$CATOBJEXT" = "x.mo" ; then
@@ -14379,7 +14370,7 @@
else
localedir=`eval echo "${datadir}/locale"`
fi
-@@ -28867,8 +29595,8 @@ _ACEOF
+@@ -28869,8 +29595,8 @@ _ACEOF
@@ -14390,7 +14381,7 @@
# Check whether --with-x was given.
-@@ -28882,11 +29610,11 @@ if test "x$with_x" = xno; then
+@@ -28884,11 +29610,11 @@ if test "x$with_x" = xno; then
have_x=disabled
else
case $x_includes,$x_libraries in #(
@@ -14405,7 +14396,7 @@
else
# One or both of the vars are not set, and there is no cached value.
ac_x_includes=no ac_x_libraries=no
-@@ -28907,7 +29635,7 @@ _ACEOF
+@@ -28909,7 +29635,7 @@ _ACEOF
eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
done
# Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
@@ -14414,7 +14405,7 @@
if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
test -f "$ac_im_libdir/libX11.$ac_extension"; then
ac_im_usrlibdir=$ac_im_libdir; break
-@@ -28982,13 +29710,14 @@ case "(($ac_try" in
+@@ -28984,13 +29710,14 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14431,7 +14422,7 @@
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -28996,7 +29725,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -28998,7 +29725,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
# We can compile using X headers with no special include directory.
ac_x_includes=
else
@@ -14440,7 +14431,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do
-@@ -29037,30 +29766,33 @@ case "(($ac_try" in
+@@ -29039,30 +29766,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14481,7 +14472,7 @@
if test -r "$ac_dir/libX11.$ac_extension"; then
ac_x_libraries=$ac_dir
break 2
-@@ -29069,6 +29801,7 @@ do
+@@ -29071,6 +29801,7 @@ do
done
fi
@@ -14489,7 +14480,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = no
-@@ -29091,8 +29824,8 @@ fi
+@@ -29093,8 +29824,8 @@ fi
fi # $with_x != no
if test "$have_x" != yes; then
@@ -14500,7 +14491,7 @@
no_x=yes
else
# If each of the values was on the command line, it overrides each guess.
-@@ -29102,8 +29835,8 @@ else
+@@ -29104,8 +29835,8 @@ else
ac_cv_have_x="have_x=yes\
ac_x_includes='$x_includes'\
ac_x_libraries='$x_libraries'"
@@ -14511,7 +14502,7 @@
fi
if test "$no_x" = yes; then
-@@ -29124,8 +29857,8 @@ else
+@@ -29126,8 +29857,8 @@ else
X_LIBS="$X_LIBS -L$x_libraries"
# For Solaris; some versions of Sun CC require a space after -R and
# others require no space. Words are not sufficient . . . .
@@ -14522,7 +14513,7 @@
ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
ac_xsave_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
-@@ -29150,23 +29883,26 @@ case "(($ac_try" in
+@@ -29152,23 +29883,26 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14556,7 +14547,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
LIBS="$ac_xsave_LIBS -R $x_libraries"
-@@ -29191,33 +29927,38 @@ case "(($ac_try" in
+@@ -29193,33 +29927,38 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14604,7 +14595,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
ac_c_werror_flag=$ac_xsave_c_werror_flag
-@@ -29263,27 +30004,30 @@ case "(($ac_try" in
+@@ -29265,27 +30004,30 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14643,7 +14634,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldnet $LIBS"
-@@ -29315,41 +30059,45 @@ case "(($ac_try" in
+@@ -29317,41 +30059,45 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14699,7 +14690,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldnet_stub $LIBS"
-@@ -29381,32 +30129,36 @@ case "(($ac_try" in
+@@ -29383,32 +30129,36 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14743,7 +14734,7 @@
if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
fi
-@@ -29414,6 +30166,7 @@ fi
+@@ -29416,6 +30166,7 @@ fi
fi
fi
@@ -14751,7 +14742,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_xsave_LIBS"
-@@ -29426,10 +30179,10 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -29428,10 +30179,10 @@ rm -f core conftest.err conftest.$ac_obj
# on Irix 5.2, according to T.E. Dickey.
# The functions gethostbyname, getservbyname, and inet_addr are
# in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
@@ -14765,7 +14756,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -29482,37 +30235,41 @@ case "(($ac_try" in
+@@ -29484,37 +30235,41 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14817,7 +14808,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lnsl $LIBS"
-@@ -29544,41 +30301,45 @@ case "(($ac_try" in
+@@ -29546,41 +30301,45 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14873,7 +14864,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lbsd $LIBS"
-@@ -29610,32 +30371,36 @@ case "(($ac_try" in
+@@ -29612,32 +30371,36 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14917,7 +14908,7 @@
if test $ac_cv_lib_bsd_gethostbyname = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
fi
-@@ -29650,10 +30415,10 @@ fi
+@@ -29652,10 +30415,10 @@ fi
# variants that don't use the name server (or something). -lsocket
# must be given before -lnsl if both are needed. We assume that
# if connect needs -lnsl, so does gethostbyname.
@@ -14931,7 +14922,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -29706,37 +30471,41 @@ case "(($ac_try" in
+@@ -29708,37 +30471,41 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14983,7 +14974,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-@@ -29768,32 +30537,36 @@ case "(($ac_try" in
+@@ -29770,32 +30537,36 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15027,7 +15018,7 @@
if test $ac_cv_lib_socket_connect = yes; then
X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
fi
-@@ -29801,10 +30574,10 @@ fi
+@@ -29803,10 +30574,10 @@ fi
fi
# Guillermo Gomez says -lposix is necessary on A/UX.
@@ -15041,7 +15032,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -29857,37 +30630,41 @@ case "(($ac_try" in
+@@ -29859,37 +30630,41 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15093,7 +15084,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lposix $LIBS"
-@@ -29919,32 +30696,36 @@ case "(($ac_try" in
+@@ -29921,32 +30696,36 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15137,7 +15128,7 @@
if test $ac_cv_lib_posix_remove = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
-@@ -29952,10 +30733,10 @@ fi
+@@ -29954,10 +30733,10 @@ fi
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -15151,7 +15142,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -30008,37 +30789,41 @@ case "(($ac_try" in
+@@ -30010,37 +30789,41 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15203,7 +15194,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lipc $LIBS"
-@@ -30070,32 +30855,36 @@ case "(($ac_try" in
+@@ -30072,32 +30855,36 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15247,7 +15238,7 @@
if test $ac_cv_lib_ipc_shmat = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -30112,10 +30901,10 @@ fi
+@@ -30114,10 +30901,10 @@ fi
# These have to be linked with before -lX11, unlike the other
# libraries we check for below, so use a different variable.
# John Interrante, Karl Berry
@@ -15261,7 +15252,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-@@ -30147,32 +30936,36 @@ case "(($ac_try" in
+@@ -30149,32 +30936,36 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15305,7 +15296,7 @@
if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
fi
-@@ -30182,10 +30975,10 @@ fi
+@@ -30184,10 +30975,10 @@ fi
fi
@@ -15319,7 +15310,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -30238,39 +31031,43 @@ case "(($ac_try" in
+@@ -30240,39 +31031,43 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15373,7 +15364,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lnsl $LIBS"
-@@ -30302,32 +31099,36 @@ case "(($ac_try" in
+@@ -30304,32 +31099,36 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15417,7 +15408,7 @@
if test $ac_cv_lib_nsl_gethostbyname = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBNSL 1
-@@ -30339,10 +31140,10 @@ fi
+@@ -30341,10 +31140,10 @@ fi
fi
@@ -15431,7 +15422,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -30395,39 +31196,43 @@ case "(($ac_try" in
+@@ -30397,39 +31196,43 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15485,7 +15476,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsocket $LIBS"
-@@ -30459,32 +31264,36 @@ case "(($ac_try" in
+@@ -30461,32 +31264,36 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15529,7 +15520,7 @@
if test $ac_cv_lib_socket_connect = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSOCKET 1
-@@ -30496,10 +31305,10 @@ fi
+@@ -30498,10 +31305,10 @@ fi
fi
@@ -15543,7 +15534,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -30552,39 +31361,43 @@ case "(($ac_try" in
+@@ -30554,39 +31361,43 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15597,7 +15588,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lresolv $LIBS"
-@@ -30616,32 +31429,36 @@ case "(($ac_try" in
+@@ -30618,32 +31429,36 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15641,7 +15632,7 @@
if test $ac_cv_lib_resolv_inet_aton = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBRESOLV 1
-@@ -30658,17 +31475,17 @@ fi
+@@ -30660,17 +31475,17 @@ fi
saved_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
test -z "$with_xauth" && { if test "${ac_cv_header_X11_Xauth_h+set}" = set; then
@@ -15666,7 +15657,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30684,32 +31501,33 @@ case "(($ac_try" in
+@@ -30686,32 +31501,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15707,7 +15698,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30723,51 +31541,52 @@ case "(($ac_try" in
+@@ -30725,51 +31541,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15781,7 +15772,7 @@
( cat <<\_ASBOX
## ---------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
-@@ -30776,15 +31595,15 @@ _ASBOX
+@@ -30778,15 +31595,15 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -15802,7 +15793,7 @@
fi
if test $ac_cv_header_X11_Xauth_h = yes; then
-@@ -30794,10 +31613,10 @@ else
+@@ -30796,10 +31613,10 @@ else
fi
}
@@ -15816,7 +15807,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXau $X_LIBS $LIBS"
-@@ -30829,32 +31648,36 @@ case "(($ac_try" in
+@@ -30831,32 +31648,36 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15860,7 +15851,7 @@
if test $ac_cv_lib_Xau_XauGetAuthByAddr = yes; then
:
else
-@@ -30894,20 +31717,21 @@ for ac_header in fcntl.h sys/param.h sys
+@@ -30896,20 +31717,21 @@ for ac_header in fcntl.h sys/param.h sys
mnttab.h mntent.h sys/statvfs.h sys/vfs.h sys/mount.h \
sys/filsys.h sys/fs_types.h sys/fs/s5param.h
do
@@ -15891,7 +15882,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30923,32 +31747,33 @@ case "(($ac_try" in
+@@ -30925,32 +31747,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15932,7 +15923,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30962,51 +31787,52 @@ case "(($ac_try" in
+@@ -30964,51 +31787,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16006,7 +15997,7 @@
( cat <<\_ASBOX
## ---------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ##
-@@ -31015,21 +31841,23 @@ _ASBOX
+@@ -31017,21 +31841,23 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -16038,7 +16029,7 @@
_ACEOF
fi
-@@ -31059,11 +31887,11 @@ for ac_func in bcopy endgrent endpwent f
+@@ -31061,11 +31887,11 @@ for ac_func in bcopy endgrent endpwent f
getcwd getmntinfo gettimeofday isascii lchown \
listmntent memcpy mkfifo strchr strerror strrchr vprintf
do
@@ -16054,7 +16045,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -31116,35 +31944,41 @@ case "(($ac_try" in
+@@ -31118,35 +31944,41 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16106,7 +16097,7 @@
_ACEOF
fi
-@@ -31177,10 +32011,10 @@ list_mounted_fs=
+@@ -31179,10 +32011,10 @@ list_mounted_fs=
# make sure LIBS contains -lsun (on Irix4) or -lseq (on PTX).
# getmntent is in the standard C library on UNICOS, in -lsun on Irix 4,
# -lseq on Dynix/PTX, -lgen on Unixware.
@@ -16120,7 +16111,7 @@
else
ac_func_search_save_LIBS=$LIBS
cat >conftest.$ac_ext <<_ACEOF
-@@ -31218,26 +32052,30 @@ case "(($ac_try" in
+@@ -31220,26 +32052,30 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16156,7 +16147,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext
if test "${ac_cv_search_getmntent+set}" = set; then
-@@ -31252,8 +32090,8 @@ fi
+@@ -31254,8 +32090,8 @@ fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
@@ -16167,7 +16158,7 @@
ac_res=$ac_cv_search_getmntent
if test "$ac_res" != no; then
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-@@ -31280,10 +32118,10 @@ fi
+@@ -31282,10 +32118,10 @@ fi
if test -z "$list_mounted_fs"; then
# Cray UNICOS 9
@@ -16181,7 +16172,7 @@
else
fu_cv_sys_mounted_cray_listmntent=no
cat >conftest.$ac_ext <<_ACEOF
-@@ -31309,8 +32147,8 @@ rm -f conftest*
+@@ -31311,8 +32147,8 @@ rm -f conftest*
fi
@@ -16192,7 +16183,7 @@
if test $fu_cv_sys_mounted_cray_listmntent = yes; then
list_mounted_fs=found
-@@ -31328,18 +32166,18 @@ if test $ac_cv_func_getmntent = yes; the
+@@ -31330,18 +32166,18 @@ if test $ac_cv_func_getmntent = yes; the
if test -z "$list_mounted_fs"; then
# 4.3BSD, SunOS, HP-UX, Dynix, Irix
@@ -16216,7 +16207,7 @@
if test $fu_cv_sys_mounted_getmntent1 = yes; then
list_mounted_fs=found
-@@ -31352,10 +32190,10 @@ fi
+@@ -31354,10 +32190,10 @@ fi
if test -z "$list_mounted_fs"; then
# SVR4
@@ -16230,7 +16221,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -31376,8 +32214,8 @@ rm -f conftest*
+@@ -31378,8 +32214,8 @@ rm -f conftest*
fi
@@ -16241,7 +16232,7 @@
if test $fu_cv_sys_mounted_getmntent2 = yes; then
list_mounted_fs=found
-@@ -31389,8 +32227,8 @@ fi
+@@ -31391,8 +32227,8 @@ fi
fi
if test -z "$list_mounted_fs"; then
@@ -16252,7 +16243,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -31398,10 +32236,10 @@ fi
+@@ -31400,10 +32236,10 @@ fi
if test -z "$list_mounted_fs"; then
# DEC Alpha running OSF/1.
@@ -16266,7 +16257,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -31428,32 +32266,36 @@ case "(($ac_try" in
+@@ -31430,32 +32266,36 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16310,7 +16301,7 @@
if test $fu_cv_sys_mounted_getsstat = yes; then
list_mounted_fs=found
-@@ -31466,10 +32308,10 @@ fi
+@@ -31468,10 +32308,10 @@ fi
if test -z "$list_mounted_fs"; then
# AIX.
@@ -16324,7 +16315,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -31484,20 +32326,21 @@ case "(($ac_try" in
+@@ -31486,20 +32326,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16349,7 +16340,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
fu_cv_sys_mounted_vmount=no
-@@ -31506,8 +32349,8 @@ fi
+@@ -31508,8 +32349,8 @@ fi
rm -f conftest.err conftest.$ac_ext
fi
@@ -16360,7 +16351,7 @@
if test $fu_cv_sys_mounted_vmount = yes; then
list_mounted_fs=found
-@@ -31520,10 +32363,10 @@ fi
+@@ -31522,10 +32363,10 @@ fi
if test -z "$list_mounted_fs"; then
# SVR3
@@ -16374,7 +16365,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -31541,20 +32384,21 @@ case "(($ac_try" in
+@@ -31543,20 +32384,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16399,7 +16390,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
fu_cv_sys_mounted_fread_fstyp=no
-@@ -31563,8 +32407,8 @@ fi
+@@ -31565,8 +32407,8 @@ fi
rm -f conftest.err conftest.$ac_ext
fi
@@ -16410,7 +16401,7 @@
if test $fu_cv_sys_mounted_fread_fstyp = yes; then
list_mounted_fs=found
-@@ -31577,10 +32421,10 @@ fi
+@@ -31579,10 +32421,10 @@ fi
if test -z "$list_mounted_fs"; then
# 4.4BSD and DEC OSF/1.
@@ -16424,7 +16415,7 @@
else
ok=
-@@ -31607,8 +32451,8 @@ test -n "$ok" \
+@@ -31609,8 +32451,8 @@ test -n "$ok" \
fi
@@ -16435,7 +16426,7 @@
if test $fu_cv_sys_mounted_getmntinfo = yes; then
list_mounted_fs=found
-@@ -31623,10 +32467,10 @@ fi
+@@ -31625,10 +32467,10 @@ fi
if test -z "$list_mounted_fs"; then
# Ultrix
@@ -16449,7 +16440,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -31643,20 +32487,21 @@ case "(($ac_try" in
+@@ -31645,20 +32487,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16474,7 +16465,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
fu_cv_sys_mounted_getmnt=no
-@@ -31665,8 +32510,8 @@ fi
+@@ -31667,8 +32510,8 @@ fi
rm -f conftest.err conftest.$ac_ext
fi
@@ -16485,7 +16476,7 @@
if test $fu_cv_sys_mounted_getmnt = yes; then
list_mounted_fs=found
-@@ -31679,10 +32524,10 @@ fi
+@@ -31681,10 +32524,10 @@ fi
if test -z "$list_mounted_fs"; then
# SVR2
@@ -16499,7 +16490,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -31697,20 +32542,21 @@ case "(($ac_try" in
+@@ -31699,20 +32542,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16524,7 +16515,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
fu_cv_sys_mounted_fread=no
-@@ -31719,8 +32565,8 @@ fi
+@@ -31721,8 +32565,8 @@ fi
rm -f conftest.err conftest.$ac_ext
fi
@@ -16535,7 +16526,7 @@
if test $fu_cv_sys_mounted_fread = yes; then
list_mounted_fs=found
-@@ -31732,15 +32578,15 @@ fi
+@@ -31734,15 +32578,15 @@ fi
fi
if test -z "$list_mounted_fs"; then
@@ -16555,7 +16546,7 @@
space=no
# Perform only the link test since it seems there are no variants of the
-@@ -31751,10 +32597,10 @@ space=no
+@@ -31753,10 +32597,10 @@ space=no
# is what it gets when this test fails.
if test $space = no; then
# SVR4
@@ -16569,7 +16560,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -31778,31 +32624,35 @@ case "(($ac_try" in
+@@ -31780,31 +32624,35 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16612,7 +16603,7 @@
if test $fu_cv_sys_stat_statvfs = yes; then
space=yes
-@@ -31815,10 +32665,10 @@ fi
+@@ -31817,10 +32665,10 @@ fi
if test $space = no; then
# DEC Alpha running OSF/1
@@ -16626,7 +16617,7 @@
else
if test "$cross_compiling" = yes; then
fu_cv_sys_stat_statfs3_osf1=no
-@@ -31846,37 +32696,40 @@ case "(($ac_try" in
+@@ -31848,37 +32696,40 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16675,7 +16666,7 @@
if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
space=yes
-@@ -31889,10 +32742,10 @@ fi
+@@ -31891,10 +32742,10 @@ fi
if test $space = no; then
# AIX
@@ -16689,7 +16680,7 @@
else
if test "$cross_compiling" = yes; then
fu_cv_sys_stat_statfs2_bsize=no
-@@ -31926,37 +32779,40 @@ case "(($ac_try" in
+@@ -31928,37 +32779,40 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16738,7 +16729,7 @@
if test $fu_cv_sys_stat_statfs2_bsize = yes; then
space=yes
-@@ -31969,10 +32825,10 @@ fi
+@@ -31971,10 +32825,10 @@ fi
if test $space = no; then
# SVR3
@@ -16752,7 +16743,7 @@
else
if test "$cross_compiling" = yes; then
fu_cv_sys_stat_statfs4=no
-@@ -31997,37 +32853,40 @@ case "(($ac_try" in
+@@ -31999,37 +32853,40 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16801,7 +16792,7 @@
if test $fu_cv_sys_stat_statfs4 = yes; then
space=yes
-@@ -32040,10 +32899,10 @@ fi
+@@ -32042,10 +32899,10 @@ fi
if test $space = no; then
# 4.4BSD and NetBSD
@@ -16815,7 +16806,7 @@
else
if test "$cross_compiling" = yes; then
fu_cv_sys_stat_statfs2_fsize=no
-@@ -32074,37 +32933,40 @@ case "(($ac_try" in
+@@ -32076,37 +32933,40 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16864,7 +16855,7 @@
if test $fu_cv_sys_stat_statfs2_fsize = yes; then
space=yes
-@@ -32117,10 +32979,10 @@ fi
+@@ -32119,10 +32979,10 @@ fi
if test $space = no; then
# Ultrix
@@ -16878,7 +16869,7 @@
else
if test "$cross_compiling" = yes; then
fu_cv_sys_stat_fs_data=no
-@@ -32155,37 +33017,40 @@ case "(($ac_try" in
+@@ -32157,37 +33017,40 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16927,7 +16918,7 @@
if test $fu_cv_sys_stat_fs_data = yes; then
space=yes
-@@ -32211,13 +33076,14 @@ case "(($ac_try" in
+@@ -32213,13 +33076,14 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16944,7 +16935,7 @@
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -32229,7 +33095,7 @@ _ACEOF
+@@ -32231,7 +33095,7 @@ _ACEOF
space=yes
else
@@ -16953,7 +16944,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -32247,10 +33113,10 @@ fi
+@@ -32249,10 +33113,10 @@ fi
# Check for SunOS statfs brokenness wrt partitions 2GB and larger.
# If <sys/vfs.h> exists and struct statfs has a member named f_spare,
# enable the work-around code in fsusage.c.
@@ -16967,7 +16958,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -32278,20 +33144,21 @@ case "(($ac_try" in
+@@ -32280,20 +33144,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16992,7 +16983,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
fu_cv_sys_truncating_statfs=no
-@@ -32307,11 +33174,11 @@ cat >>confdefs.h <<\_ACEOF
+@@ -32309,11 +33174,11 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
fi
@@ -17008,7 +16999,7 @@
test -d /afs &&
cat >>confdefs.h <<\_ACEOF
#define AFS 1
-@@ -32466,32 +33333,32 @@ fi
+@@ -32468,32 +33333,32 @@ fi
if test x$enable_gtk_doc = xyes; then
if test -n "$PKG_CONFIG" && \
@@ -17052,7 +17043,7 @@
else
case $GTKDOC_CHECK in
[\\/]* | ?:[\\/]*)
-@@ -32506,7 +33373,7 @@ do
+@@ -32508,7 +33373,7 @@ do
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_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
@@ -17061,7 +17052,7 @@
break 2
fi
done
-@@ -32518,11 +33385,11 @@ esac
+@@ -32520,11 +33385,11 @@ esac
fi
GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
if test -n "$GTKDOC_CHECK"; then
@@ -17077,7 +17068,7 @@
fi
-@@ -32582,11 +33449,12 @@ _ACEOF
+@@ -32584,11 +33449,12 @@ _ACEOF
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -17092,7 +17083,7 @@
*) $as_unset $ac_var ;;
esac ;;
esac
-@@ -32619,12 +33487,12 @@ echo "$as_me: WARNING: Cache variable $a
+@@ -32621,12 +33487,12 @@ echo "$as_me: WARNING: Cache variable $a
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
@@ -17109,7 +17100,7 @@
fi
fi
rm -f confcache
-@@ -32640,7 +33508,7 @@ ac_ltlibobjs=
+@@ -32642,7 +33508,7 @@ ac_ltlibobjs=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -17118,7 +17109,7 @@
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-@@ -32652,79 +33520,79 @@ LTLIBOBJS=$ac_ltlibobjs
+@@ -32654,79 +33520,79 @@ LTLIBOBJS=$ac_ltlibobjs
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
@@ -17220,7 +17211,7 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-@@ -32733,26 +33601,27 @@ fi
+@@ -32735,26 +33601,27 @@ fi
if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
@@ -17255,7 +17246,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -32765,7 +33634,7 @@ ac_cs_silent=false
+@@ -32767,7 +33634,7 @@ ac_cs_silent=false
SHELL=\${CONFIG_SHELL-$SHELL}
_ACEOF
@@ -17264,7 +17255,7 @@
## --------------------- ##
## M4sh Initialization. ##
## --------------------- ##
-@@ -32775,7 +33644,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
+@@ -32777,7 +33644,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -17273,7 +17264,7 @@
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
-@@ -32797,17 +33666,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
+@@ -32799,17 +33666,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
@@ -17328,7 +17319,7 @@
fi
# Support unset when possible.
-@@ -32823,8 +33720,6 @@ fi
+@@ -32825,8 +33720,6 @@ fi
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
@@ -17337,7 +17328,7 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-@@ -32847,7 +33742,7 @@ if test "x$as_myself" = x; then
+@@ -32849,7 +33742,7 @@ if test "x$as_myself" = x; then
as_myself=$0
fi
if test ! -f "$as_myself"; then
@@ -17346,7 +17337,7 @@
{ (exit 1); exit 1; }
fi
-@@ -32860,17 +33755,10 @@ PS2='> '
+@@ -32862,17 +33755,10 @@ PS2='> '
PS4='+ '
# NLS nuisances.
@@ -17368,7 +17359,7 @@
# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
-@@ -32892,7 +33780,7 @@ as_me=`$as_basename -- "$0" ||
+@@ -32894,7 +33780,7 @@ as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
@@ -17377,7 +17368,7 @@
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
-@@ -32943,7 +33831,7 @@ $as_unset CDPATH
+@@ -32945,7 +33831,7 @@ $as_unset CDPATH
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
@@ -17386,7 +17377,7 @@
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
-@@ -32971,7 +33859,6 @@ case `echo -n x` in
+@@ -32973,7 +33859,6 @@ case `echo -n x` in
*)
ECHO_N='-n';;
esac
@@ -17394,7 +17385,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -32984,19 +33871,22 @@ if test -d conf$$.dir; then
+@@ -32986,19 +33871,22 @@ if test -d conf$$.dir; then
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
@@ -17428,7 +17419,7 @@
else
as_ln_s='cp -p'
fi
-@@ -33021,10 +33911,10 @@ else
+@@ -33023,10 +33911,10 @@ else
as_test_x='
eval sh -c '\''
if test -d "$1"; then
@@ -17441,16 +17432,16 @@
esac;
case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
???[sx]*):;;*)false;;esac;fi
-@@ -33047,7 +33937,7 @@ exec 6>&1
+@@ -33049,7 +33937,7 @@ exec 6>&1
# values after options handling.
ac_log="
- This file was extended by libgtop $as_me 2.22.3, which was
+ This file was extended by libgtop $as_me 2.24.0, which was
-generated by GNU Autoconf 2.61. Invocation command line was
+generated by GNU Autoconf 2.62. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -33060,7 +33950,7 @@ on `(hostname || uname -n) 2>/dev/null |
+@@ -33062,7 +33950,7 @@ on `(hostname || uname -n) 2>/dev/null |
_ACEOF
@@ -17459,7 +17450,7 @@
# Files that config.status was made for.
config_files="$ac_config_files"
config_headers="$ac_config_headers"
-@@ -33068,7 +33958,7 @@ config_commands="$ac_config_commands"
+@@ -33070,7 +33958,7 @@ config_commands="$ac_config_commands"
_ACEOF
@@ -17468,7 +17459,7 @@
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -33081,9 +33971,9 @@ Usage: $0 [OPTIONS] [FILE]...
+@@ -33083,9 +33971,9 @@ Usage: $0 [OPTIONS] [FILE]...
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
--file=FILE[:TEMPLATE]
@@ -17480,14 +17471,14 @@
Configuration files:
$config_files
-@@ -33097,24 +33987,25 @@ $config_commands
+@@ -33099,24 +33987,25 @@ $config_commands
Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
- libgtop config.status 2.22.3
+ libgtop config.status 2.24.0
-configured by $0, generated by GNU Autoconf 2.61,
- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.62,
@@ -17513,7 +17504,7 @@
ac_need_defaults=:
while test $# != 0
do
-@@ -33136,30 +34027,36 @@ do
+@@ -33138,30 +34027,36 @@ do
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
@@ -17556,7 +17547,7 @@
Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; } ;;
-@@ -33178,27 +34075,29 @@ if $ac_cs_silent; then
+@@ -33180,27 +34075,29 @@ if $ac_cs_silent; then
fi
_ACEOF
@@ -17593,7 +17584,7 @@
#
# INIT-COMMANDS
#
-@@ -33207,7 +34106,7 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac
+@@ -33209,7 +34106,7 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac
_ACEOF
@@ -17602,7 +17593,7 @@
# Handling of arguments.
for ac_config_target in $ac_config_targets
-@@ -33245,8 +34144,8 @@ do
+@@ -33247,8 +34144,8 @@ do
"libgtopconfig.h") CONFIG_FILES="$CONFIG_FILES libgtopconfig.h" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -17613,7 +17604,7 @@
{ (exit 1); exit 1; }; };;
esac
done
-@@ -33287,357 +34186,143 @@ $debug ||
+@@ -33289,357 +34186,143 @@ $debug ||
(umask 077 && mkdir "$tmp")
} ||
{
@@ -18079,7 +18070,7 @@
# VPATH may cause trouble with some makes, so we remove $(srcdir),
# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
-@@ -33653,19 +34338,133 @@ s/^[^=]*=[ ]*$//
+@@ -33655,19 +34338,133 @@ s/^[^=]*=[ ]*$//
}'
fi
@@ -18217,7 +18208,7 @@
{ (exit 1); exit 1; }; };;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-@@ -33694,26 +34493,38 @@ echo "$as_me: error: Invalid tag $ac_tag
+@@ -33696,26 +34493,38 @@ echo "$as_me: error: Invalid tag $ac_tag
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -18264,7 +18255,7 @@
esac
;;
esac
-@@ -33723,7 +34534,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^
+@@ -33725,7 +34534,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^
X"$ac_file" : 'X\(//\)[^/]' \| \
X"$ac_file" : 'X\(//\)$' \| \
X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
@@ -18273,7 +18264,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -33749,7 +34560,7 @@ echo X"$ac_file" |
+@@ -33751,7 +34560,7 @@ echo X"$ac_file" |
as_dirs=
while :; do
case $as_dir in #(
@@ -18282,7 +18273,7 @@
*) as_qdir=$as_dir;;
esac
as_dirs="'$as_qdir' $as_dirs"
-@@ -33758,7 +34569,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/
+@@ -33760,7 +34569,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
@@ -18291,7 +18282,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -33779,17 +34590,17 @@ echo X"$as_dir" |
+@@ -33781,17 +34590,17 @@ echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
@@ -18313,7 +18304,7 @@
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-@@ -33829,12 +34640,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
+@@ -33831,12 +34640,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
esac
_ACEOF
@@ -18329,7 +18320,7 @@
p
q
}
-@@ -33843,13 +34655,14 @@ case `sed -n '/datarootdir/ {
+@@ -33845,13 +34655,14 @@ case `sed -n '/datarootdir/ {
/@infodir@/p
/@localedir@/p
/@mandir@/p
@@ -18348,7 +18339,7 @@
ac_datarootdir_hack='
s&@datadir@&$datadir&g
s&@docdir@&$docdir&g
-@@ -33863,15 +34676,16 @@ _ACEOF
+@@ -33865,15 +34676,16 @@ _ACEOF
# Neutralize VPATH when `$srcdir' = `.'.
# Shell code in configure.ac might set extrasub.
# FIXME: do we really want to maintain this feature?
@@ -18369,7 +18360,7 @@
s&@srcdir@&$ac_srcdir&;t t
s&@abs_srcdir@&$ac_abs_srcdir&;t t
s&@top_srcdir@&$ac_top_srcdir&;t t
-@@ -33881,135 +34695,74 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
+@@ -33883,135 +34695,74 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
$ac_datarootdir_hack
@@ -18546,7 +18537,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -34029,8 +34782,8 @@ echo X$ac_file |
+@@ -34031,8 +34782,8 @@ echo X$ac_file |
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -18557,7 +18548,7 @@
;;
esac
-@@ -34051,7 +34804,7 @@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/
+@@ -34053,7 +34804,7 @@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/
X"$mf" : 'X\(//\)[^/]' \| \
X"$mf" : 'X\(//\)$' \| \
X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
@@ -18566,7 +18557,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -34095,7 +34848,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][
+@@ -34097,7 +34848,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][
X"$file" : 'X\(//\)[^/]' \| \
X"$file" : 'X\(//\)$' \| \
X"$file" : 'X\(/\)' \| . 2>/dev/null ||
@@ -18575,7 +18566,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -34121,7 +34874,7 @@ echo X"$file" |
+@@ -34123,7 +34874,7 @@ echo X"$file" |
as_dirs=
while :; do
case $as_dir in #(
@@ -18584,7 +18575,7 @@
*) as_qdir=$as_dir;;
esac
as_dirs="'$as_qdir' $as_dirs"
-@@ -34130,7 +34883,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/
+@@ -34132,7 +34883,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
@@ -18593,7 +18584,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -34151,8 +34904,8 @@ echo X"$as_dir" |
+@@ -34153,8 +34904,8 @@ echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
@@ -18604,7 +18595,7 @@
{ (exit 1); exit 1; }; }; }
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
-@@ -34172,8 +34925,8 @@ done
+@@ -34174,8 +34925,8 @@ done
"$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES"
if test ! -f "po/Makefile"; then
@@ -18615,7 +18606,7 @@
{ (exit 1); exit 1; }; }
fi
mv "po/Makefile" "po/Makefile.tmp"
-@@ -34195,6 +34948,11 @@ _ACEOF
+@@ -34197,6 +34948,11 @@ _ACEOF
chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
@@ -18627,7 +18618,7 @@
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
-@@ -34216,4 +34974,8 @@ if test "$no_create" != yes; then
+@@ -34218,4 +34974,8 @@ if test "$no_create" != yes; then
# would make configure fail if this is the last instruction.
$ac_cs_success || { (exit 1); exit 1; }
fi
diff --git a/devel/libgtop/files/patch-libgtop-sysdeps.m4 b/devel/libgtop/files/patch-libgtop-sysdeps.m4
index 0b72b319b545..1805da02a85d 100644
--- a/devel/libgtop/files/patch-libgtop-sysdeps.m4
+++ b/devel/libgtop/files/patch-libgtop-sysdeps.m4
@@ -1,14 +1,5 @@
--- libgtop-sysdeps.m4.orig 2008-04-21 14:58:38.000000000 -0400
+++ libgtop-sysdeps.m4 2008-12-06 16:16:00.000000000 -0500
-@@ -79,6 +79,8 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
- libgtop_sysdeps_dir=freebsd
- libgtop_use_machine_h=yes
- libgtop_need_server=yes
-+ libgtop_sysdeps_private_mountlist=yes
-+ libgtop_sysdeps_private_fsusage=yes
- libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
- ;;
- solaris*)
@@ -158,6 +160,9 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
if test -n "${osreldate}" && test ${osreldate} -ge 600000 ; then
EXTRA_SYSDEPS_LIBS="-lgeom -ldevstat"
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.am b/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.am
new file mode 100644
index 000000000000..25ec1f7d7949
--- /dev/null
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.am
@@ -0,0 +1,17 @@
+--- sysdeps/freebsd/Makefile.am.orig 2008-09-29 17:21:56.000000000 -0400
++++ sysdeps/freebsd/Makefile.am 2008-09-29 17:22:07.000000000 -0400
+@@ -7,12 +7,12 @@ libgtop_sysdeps_2_0_la_SOURCES = nosuid.
+ cpu.c msg_limits.c sem_limits.c loadavg.c \
+ uptime.c netlist.c fsusage.c mem.c \
+ mountlist.c procopenfiles.c procwd.c \
+- procaffinity.c glibtop_private.c
++ procaffinity.c glibtop_private.c open.c
+
+ libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
+
+ libgtop_sysdeps_suid_2_0_la_LIBADD = $(KVM_LIBS) $(EXTRA_SYSDEPS_LIBS)
+-libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c swap.c \
++libgtop_sysdeps_suid_2_0_la_SOURCES = suid_open.c close.c swap.c \
+ proclist.c procstate.c procuid.c \
+ proctime.c procmem.c procsignal.c \
+ prockernel.c procsegment.c procargs.c \
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in b/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in
index e8a6bd895fa5..f68c6d0d186f 100644
--- a/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in
@@ -1,28 +1,40 @@
---- sysdeps/freebsd/Makefile.in.orig 2007-11-02 23:55:07.000000000 -0400
-+++ sysdeps/freebsd/Makefile.in 2007-11-02 23:58:08.000000000 -0400
-@@ -54,7 +54,7 @@ libgtop_sysdeps_2_0_la_LIBADD =
+--- sysdeps/freebsd/Makefile.in.orig 2008-09-29 17:24:03.000000000 -0400
++++ sysdeps/freebsd/Makefile.in 2008-09-29 17:24:44.000000000 -0400
+@@ -54,12 +54,13 @@ libgtop_sysdeps_2_0_la_LIBADD =
am_libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo sysinfo.lo \
shm_limits.lo cpu.lo msg_limits.lo sem_limits.lo loadavg.lo \
- uptime.lo netlist.lo fsusage.lo mem.lo procopenfiles.lo \
-- procwd.lo glibtop_private.lo
-+ procwd.lo glibtop_private.lo mountlist.lo
+ uptime.lo netlist.lo fsusage.lo mem.lo mountlist.lo \
+- procopenfiles.lo procwd.lo procaffinity.lo glibtop_private.lo
++ procopenfiles.lo procwd.lo procaffinity.lo glibtop_private.lo \
++ open.lo
libgtop_sysdeps_2_0_la_OBJECTS = $(am_libgtop_sysdeps_2_0_la_OBJECTS)
am__DEPENDENCIES_1 =
libgtop_sysdeps_suid_2_0_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@@ -303,7 +303,7 @@ libgtop_sysdeps_2_0_la_SOURCES = nosuid.
+ $(am__DEPENDENCIES_1)
+-am_libgtop_sysdeps_suid_2_0_la_OBJECTS = open.lo close.lo swap.lo \
++am_libgtop_sysdeps_suid_2_0_la_OBJECTS = suid_open.lo close.lo swap.lo \
+ proclist.lo procstate.lo procuid.lo proctime.lo procmem.lo \
+ procsignal.lo prockernel.lo procsegment.lo procargs.lo \
+ procmap.lo netload.lo ppp.lo
+@@ -306,11 +307,11 @@ libgtop_sysdeps_2_0_la_SOURCES = nosuid.
cpu.c msg_limits.c sem_limits.c loadavg.c \
uptime.c netlist.c fsusage.c mem.c \
- procopenfiles.c procwd.c \
-- glibtop_private.c
-+ glibtop_private.c mountlist.c
+ mountlist.c procopenfiles.c procwd.c \
+- procaffinity.c glibtop_private.c
++ procaffinity.c glibtop_private.c open.c
libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
libgtop_sysdeps_suid_2_0_la_LIBADD = $(KVM_LIBS) $(EXTRA_SYSDEPS_LIBS)
-@@ -374,6 +374,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/close.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsusage.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mountlist.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glibtop_private.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadavg.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mem.Plo@am__quote@
+-libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c swap.c \
++libgtop_sysdeps_suid_2_0_la_SOURCES = suid_open.c close.c swap.c \
+ proclist.c procstate.c procuid.c \
+ proctime.c procmem.c procsignal.c \
+ prockernel.c procsegment.c procargs.c \
+@@ -385,6 +386,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netlist.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netload.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nosuid.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/suid_open.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppp.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procaffinity.Plo@am__quote@
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_fsusage.c b/devel/libgtop/files/patch-sysdeps_freebsd_fsusage.c
deleted file mode 100644
index 90da05b1b71d..000000000000
--- a/devel/libgtop/files/patch-sysdeps_freebsd_fsusage.c
+++ /dev/null
@@ -1,61 +0,0 @@
---- sysdeps/freebsd/fsusage.c.orig 2007-06-03 16:06:05.000000000 -0400
-+++ sysdeps/freebsd/fsusage.c 2008-02-09 19:50:44.000000000 -0500
-@@ -10,6 +10,7 @@
- #include <unistd.h>
- #include <sys/param.h>
- #include <sys/mount.h>
-+#include <sys/statvfs.h>
- #if __FreeBSD_version >= 600000 || defined(__FreeBSD_kernel__)
- #include <libgeom.h>
- #include <sys/resource.h>
-@@ -21,15 +22,13 @@
- #include <string.h>
- #include <stdlib.h>
-
--void
--_glibtop_freebsd_get_fsusage_read_write(glibtop *server,
-- glibtop_fsusage *buf,
-- const char *path);
-+static const unsigned long _glibtop_sysdeps_fsusage =
-+(1L << GLIBTOP_FSUSAGE_BLOCKS) + (1L << GLIBTOP_FSUSAGE_BFREE)
-++ (1L << GLIBTOP_FSUSAGE_BAVAIL) + (1L << GLIBTOP_FSUSAGE_FILES)
-++ (1L << GLIBTOP_FSUSAGE_FFREE) + (1L << GLIBTOP_FSUSAGE_BLOCK_SIZE);
-
--void
--_glibtop_freebsd_get_fsusage_read_write(glibtop *server,
-- glibtop_fsusage *buf,
-- const char *path)
-+static void
-+_glibtop_get_fsusage_read_write (glibtop *server, glibtop_fsusage *buf, const char *path)
- {
- int result;
- struct statfs sfs;
-@@ -135,3 +134,28 @@ _glibtop_freebsd_get_fsusage_read_write(
- #endif
- buf->flags |= (1 << GLIBTOP_FSUSAGE_READ) | (1 << GLIBTOP_FSUSAGE_WRITE);
- }
-+
-+void
-+glibtop_get_fsusage_s(glibtop *server, glibtop_fsusage *buf, const char *path)
-+{
-+ struct statvfs fsd;
-+
-+ glibtop_init_r (&server, 0, 0);
-+
-+ memset (buf, 0, sizeof (glibtop_fsusage));
-+
-+ if (statvfs (path, &fsd) < 0)
-+ return;
-+
-+ buf->block_size = fsd.f_frsize;
-+ buf->blocks = fsd.f_blocks;
-+ buf->bfree = fsd.f_bfree;
-+ buf->bavail = (fsd.f_bavail > fsd.f_bfree) ? 0 : fsd.f_bavail;
-+ buf->files = fsd.f_files;
-+ buf->ffree = fsd.f_ffree;
-+
-+ buf->flags = _glibtop_sysdeps_fsusage;
-+
-+ _glibtop_get_fsusage_read_write(server, buf, path);
-+}
-+
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_mountlist.c b/devel/libgtop/files/patch-sysdeps_freebsd_mountlist.c
deleted file mode 100644
index 7c1b1774cd89..000000000000
--- a/devel/libgtop/files/patch-sysdeps_freebsd_mountlist.c
+++ /dev/null
@@ -1,171 +0,0 @@
---- sysdeps/freebsd/mountlist.c.orig 2008-02-15 02:11:59.000000000 -0500
-+++ sysdeps/freebsd/mountlist.c 2008-02-15 02:28:14.000000000 -0500
-@@ -0,0 +1,168 @@
-+/* mountlist.c -- return a list of mounted filesystems
-+ Copyright (C) 1991, 1992 Free Software Foundation, Inc.
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2, or (at your option)
-+ any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program; if not, write to the Free Software Foundation,
-+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-+
-+#include <config.h>
-+
-+#include <glib.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <sys/types.h>
-+#include <sys/param.h>
-+#include <sys/mount.h>
-+
-+#include <string.h>
-+
-+#include <glibtop.h>
-+#include <glibtop/mountlist.h>
-+
-+/* A mount table entry. */
-+struct mount_entry
-+{
-+ char *me_devname; /* Device node pathname, including "/dev/". */
-+ char *me_mountdir; /* Mount point directory pathname. */
-+ char *me_type; /* "nfs", "4.2", etc. */
-+ dev_t me_dev; /* Device number of me_mountdir. */
-+ struct mount_entry *me_next;
-+};
-+
-+static struct mount_entry *read_filesystem_list (void);
-+
-+/* Return a list of the currently mounted filesystems, or NULL on error.
-+ Add each entry to the tail of the list so that they stay in order.
-+*/
-+
-+static struct mount_entry *
-+read_filesystem_list (void)
-+{
-+ struct mount_entry *mount_list;
-+ struct mount_entry *me;
-+ struct mount_entry *mtail;
-+
-+ /* Start the list off with a dummy entry. */
-+ me = g_new (struct mount_entry, 1);
-+ me->me_next = NULL;
-+ mount_list = mtail = me;
-+ {
-+ struct statfs *fsp;
-+ int entries;
-+
-+ entries = getmntinfo (&fsp, MNT_NOWAIT);
-+ if (entries < 0)
-+ return NULL;
-+ while (entries-- > 0)
-+ {
-+ me = (struct mount_entry *) g_malloc (sizeof (struct mount_entry));
-+ me->me_devname = g_strdup (fsp->f_mntfromname);
-+ me->me_mountdir = g_strdup (fsp->f_mntonname);
-+ me->me_type = g_strdup (fsp->f_fstypename);
-+ me->me_dev = (dev_t) -1; /* Magic; means not known yet. */
-+ me->me_next = NULL;
-+
-+ /* Add to the linked list. */
-+ mtail->me_next = me;
-+ mtail = me;
-+ fsp++;
-+ }
-+ }
-+
-+ /* Free the dummy head. */
-+ me = mount_list;
-+ mount_list = mount_list->me_next;
-+ g_free (me);
-+ return mount_list;
-+}
-+
-+static gboolean ignore_mount_entry(const struct mount_entry *me)
-+{
-+ /* keep sorted */
-+ static const char ignored[][17] = {
-+ "autofs",
-+ "devfs",
-+ "fusectl",
-+ "linprocfs",
-+ "linsysfs",
-+ "mfs",
-+ "none",
-+ "nfs",
-+ "nullfs",
-+ "nwfs",
-+ "portalfs",
-+ "proc",
-+ "procfs",
-+ "smbfs",
-+ "tmpfs",
-+ "unionfs",
-+ "unknown"
-+ };
-+
-+ typedef int (*Comparator)(const void*, const void*);
-+
-+ return bsearch(me->me_type,
-+ ignored, G_N_ELEMENTS(ignored), sizeof ignored[0],
-+ (Comparator) strcmp) != NULL;
-+}
-+
-+
-+glibtop_mountentry *
-+glibtop_get_mountlist_s (glibtop *server, glibtop_mountlist *buf, int all_fs)
-+{
-+ struct mount_entry *entries, *cur, *next;
-+
-+ GArray *mount_array = g_array_new(FALSE, FALSE,
-+ sizeof(glibtop_mountentry));
-+
-+ glibtop_init_r (&server, 0, 0);
-+
-+ memset (buf, 0, sizeof (glibtop_mountlist));
-+
-+ /* Read filesystem list. */
-+
-+ if((entries = read_filesystem_list ()) == NULL)
-+ return NULL;
-+
-+ for (cur = &entries[0]; cur != NULL; cur = next) {
-+
-+ if(all_fs || !ignore_mount_entry(cur)) {
-+ /* add a new glibtop_mountentry */
-+ glibtop_mountentry e;
-+
-+ g_strlcpy(e.devname, cur->me_devname, sizeof e.devname);
-+ g_strlcpy(e.mountdir, cur->me_mountdir, sizeof e.mountdir);
-+ g_strlcpy(e.type, cur->me_type, sizeof e.type);
-+ e.dev = cur->me_dev;
-+
-+ g_array_append_val(mount_array, e);
-+ }
-+
-+ /* free current mount_entry and move to the next */
-+ next = cur->me_next;
-+ g_free(cur->me_devname);
-+ g_free(cur->me_mountdir);
-+ g_free(cur->me_type);
-+ g_free(cur);
-+ }
-+
-+ buf->size = sizeof (glibtop_mountentry);
-+ buf->number = mount_array->len;
-+ buf->total = buf->number * buf->size;
-+
-+ buf->flags = (1 << GLIBTOP_MOUNTLIST_SIZE)
-+ | (1 << GLIBTOP_MOUNTLIST_NUMBER)
-+ | (1 << GLIBTOP_MOUNTLIST_TOTAL);
-+
-+ return (glibtop_mountentry*) g_array_free(mount_array, FALSE);
-+}
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_nosuid.c b/devel/libgtop/files/patch-sysdeps_freebsd_nosuid.c
new file mode 100644
index 000000000000..acb327f98162
--- /dev/null
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_nosuid.c
@@ -0,0 +1,19 @@
+--- sysdeps/freebsd/nosuid.c.orig 2008-09-29 17:28:31.000000000 -0400
++++ sysdeps/freebsd/nosuid.c 2008-09-29 17:28:39.000000000 -0400
+@@ -21,16 +21,8 @@
+
+ #include <config.h>
+ #include <glibtop.h>
+-#include <glibtop/open.h>
+ #include <glibtop/close.h>
+
+ void
+-glibtop_open_s (glibtop *server,
+- const char *program_name,
+- const unsigned long features,
+- const unsigned flags)
+-{ }
+-
+-void
+ glibtop_close_s (glibtop *server)
+ { }
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_open.c b/devel/libgtop/files/patch-sysdeps_freebsd_open.c
new file mode 100644
index 000000000000..f7bf0e3b1488
--- /dev/null
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_open.c
@@ -0,0 +1,91 @@
+--- sysdeps/freebsd/open.c.orig 2008-05-23 18:13:23.000000000 -0400
++++ sysdeps/freebsd/open.c 2008-09-29 17:23:22.000000000 -0400
+@@ -20,76 +20,33 @@
+ */
+
+ #include <config.h>
++#include <sys/types.h>
++#include <sys/sysctl.h>
+ #include <glibtop.h>
+-#include <glibtop/error.h>
+ #include <glibtop/open.h>
+-#include <glibtop/init_hooks.h>
+-
+-/* !!! THIS FUNCTION RUNS SUID ROOT - CHANGE WITH CAUTION !!! */
+-
+-void
+-glibtop_init_p (glibtop *server, const unsigned long features,
+- const unsigned flags)
+-{
+- const _glibtop_init_func_t *init_fkt;
+-
+- if (server == NULL)
+- glibtop_error_r (NULL, "glibtop_init_p (server == NULL)");
+-
+- /* Do the initialization, but only if not already initialized. */
+-
+- if ((server->flags & _GLIBTOP_INIT_STATE_SYSDEPS) == 0) {
+- glibtop_open_p (server, "glibtop", features, flags);
++#include <glibtop/cpu.h>
++#include <glibtop/error.h>
+
+- for (init_fkt = _glibtop_init_hook_p; *init_fkt; init_fkt++)
+- (*init_fkt) (server);
++#include <glibtop_private.h>
+
+- server->flags |= _GLIBTOP_INIT_STATE_SYSDEPS;
+- }
+-}
+
+ void
+-glibtop_open_p (glibtop *server, const char *program_name,
++glibtop_open_s (glibtop *server, const char *program_name,
+ const unsigned long features,
+ const unsigned flags)
+ {
+-#ifdef DEBUG
+- fprintf (stderr, "DEBUG (%d): glibtop_open_p ()\n", getpid ());
+-#endif
++ int ncpus;
++ size_t len;
+
+- /* !!! WE ARE ROOT HERE - CHANGE WITH CAUTION !!! */
++ len = sizeof (ncpus);
++ sysctlbyname ("hw.ncpu", &ncpus, &len, NULL, 0);
++ server->real_ncpu = ncpus - 1;
++ server->ncpu = MIN(GLIBTOP_NCPU - 1, server->real_ncpu);
+
+- server->machine.uid = getuid ();
+- server->machine.euid = geteuid ();
+- server->machine.gid = getgid ();
+- server->machine.egid = getegid ();
+ #if defined(__FreeBSD_kernel__)
+ server->os_version_code = __FreeBSD_kernel_version;
+ #else
+ server->os_version_code = __FreeBSD_version;
+ #endif
+- /* Setup machine-specific data */
+- server->machine.kd = kvm_open (NULL, NULL, NULL, O_RDONLY, "kvm_open");
+-
+- if (server->machine.kd == NULL)
+- glibtop_error_io_r (server, "kvm_open");
+-
+- /* Drop priviledges. */
+-
+- if (setreuid (server->machine.euid, server->machine.uid))
+- _exit (1);
+-
+- if (setregid (server->machine.egid, server->machine.gid))
+- _exit (1);
+-
+- /* !!! END OF SUID ROOT PART !!! */
+-
+- /* Our effective uid is now those of the user invoking the server,
+- * so we do no longer have any priviledges. */
+
+- /* NOTE: On FreeBSD, we do not need to be suid root, we just need to
+- * be sgid kmem.
+- *
+- * The server will only use setegid() to get back it's priviledges,
+- * so it will fail if it is suid root and not sgid kmem. */
+ }
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c b/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c
deleted file mode 100644
index a2bdf79aee8b..000000000000
--- a/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- sysdeps/freebsd/procmap.c.orig 2008-04-21 14:58:26.000000000 -0400
-+++ sysdeps/freebsd/procmap.c 2008-08-02 15:06:46.000000000 -0400
-@@ -41,7 +41,17 @@
- #define _KERNEL
- #include <sys/pipe.h>
- #include <sys/conf.h>
-+#undef _KERNEL
-+#if __FreeBSD_version >= 800038
-+#define _WANT_FILE
- #include <sys/file.h>
-+#undef _WANT_FILE
-+#else
-+#define _KERNEL
-+#include <sys/file.h>
-+#undef _KERNEL
-+#endif
-+#define _KERNEL
- #include <sys/mount.h>
- #include <ufs/ufs/quota.h>
- #include <ufs/ufs/inode.h>
-@@ -103,8 +113,14 @@ _glibtop_sysdeps_freebsd_dev_inode (glib
-
- if (kvm_read (server->machine.kd, (gulong) inode.i_dev, (char *) &si,
- sizeof (si)) != sizeof (si) ||
-+#if __FreeBSD_version >= 800039
-+ kvm_read (server->machine.kd, (gulong) cdev2priv(&si), (char *) &priv,
-+ sizeof (priv))
-+#else
- kvm_read (server->machine.kd, (gulong) si.si_priv, (char *) &priv,
-- sizeof (priv)) != sizeof (priv))
-+ sizeof (priv))
-+#endif
-+ != sizeof (priv))
- {
- glibtop_warn_io_r (server, "kvm_read (si)");
- return;
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c b/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c
index 9ca014c1b508..e14dd39bdbe2 100644
--- a/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c
@@ -1,136 +1,50 @@
---- sysdeps/freebsd/procopenfiles.c.orig 2008-12-06 20:43:44.256309000 -0500
-+++ sysdeps/freebsd/procopenfiles.c 2008-12-06 20:44:45.000000000 -0500
-@@ -28,6 +28,16 @@
- #include <glibtop/error.h>
- #include <glibtop/procopenfiles.h>
- #include <sys/types.h>
-+#include <sys/socket.h>
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#include <sys/un.h>
-+#include <sys/user.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+#ifdef HAVE_KINFO_GETFILE
+--- sysdeps/freebsd/procopenfiles.c.orig 2008-08-18 11:23:36.000000000 -0400
++++ sysdeps/freebsd/procopenfiles.c 2008-12-07 00:17:26.000000000 -0500
+@@ -35,6 +35,9 @@
+ #include <sys/user.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
++#ifdef HAVE_KINFO_PROC
+#include <libutil.h>
+#endif
#include <string.h>
#include <stdlib.h>
-@@ -46,6 +56,63 @@ _glibtop_init_proc_open_files_s (glibtop
- server->sysdeps.proc_open_files = _glibtop_sysdeps_proc_open_files;
- }
-
-+#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
-+static char *
-+addr_to_string(struct sockaddr_storage *ss)
-+{
-+ char *buffer;
-+ char buffer2[INET6_ADDRSTRLEN];
-+ struct sockaddr_in6 *sin6;
-+ struct sockaddr_in *sin;
-+ struct sockaddr_un *sun;
-+
-+ switch (ss->ss_family) {
-+ case AF_LOCAL:
-+ sun = (struct sockaddr_un *)ss;
-+ if (strlen(sun->sun_path) == 0)
-+ buffer = g_strdup("-");
-+ else
-+ buffer = g_strdup(sun->sun_path);
-+ break;
-+ case AF_INET:
-+ sin = (struct sockaddr_in *)ss;
-+ buffer = g_strdup(inet_ntoa(sin->sin_addr));
-+ break;
-+ case AF_INET6:
-+ sin6 = (struct sockaddr_in6 *)ss;
-+ if (inet_ntop(AF_INET6, &sin6->sin6_addr, buffer2,
-+ sizeof(buffer2)) != NULL)
-+ buffer = g_strdup(buffer2);
-+ else
-+ buffer = g_strdup("-");
-+ break;
-+ }
-+
-+ return buffer;
-+}
-+
-+static int
-+addr_to_port(struct sockaddr_storage *ss)
-+{
-+ int port;
-+ struct sockaddr_in6 *sin6;
-+ struct sockaddr_in *sin;
-+
-+ switch (ss->ss_family) {
-+ case AF_INET:
-+ sin = (struct sockaddr_in *)ss;
-+ port = ntohs(sin->sin_port);
-+ break;
-+ case AF_INET6:
-+ sin6 = (struct sockaddr_in6 *)ss;
-+ port = ntohs(sin6->sin6_port);
-+ break;
-+ }
-+
-+ return port;
-+}
-+#else
-+
- static GArray *
- parse_output(const char *output) {
- GArray *entries;
-@@ -159,21 +226,123 @@ parse_output(const char *output) {
-
- return entries;
- }
-+#endif
-
- glibtop_open_files_entry *
- glibtop_get_proc_open_files_s (glibtop *server, glibtop_proc_open_files *buf, pid_t pid)
+@@ -263,8 +266,12 @@ glibtop_get_proc_open_files_s (glibtop *
{
-+#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
-+ struct kinfo_file *freep, *kif;
+ #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
+ struct kinfo_file *freep, *kif;
+#ifndef HAVE_KINFO_GETFILE
-+ int name[4];
-+ size_t len;
+ int name[4];
+ size_t len;
+#else
+ int cnt;
+#endif
-+ int i;
-+#else
+ size_t i;
+ #else
char *output;
-+#endif
- GArray *entries;
-
+@@ -274,6 +281,7 @@ glibtop_get_proc_open_files_s (glibtop *
memset(buf, 0, sizeof (glibtop_proc_open_files));
-+#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
+ #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
+#ifndef HAVE_KINFO_GETFILE
-+ name[0] = CTL_KERN;
-+ name[1] = KERN_PROC;
-+ name[2] = KERN_PROC_FILEDESC;
-+ name[3] = pid;
-+
-+ if (sysctl(name, 4, NULL, &len, NULL, 0) < 0)
-+ return NULL;
-+
-+ freep = kif = g_malloc(len);
-+ if (sysctl(name, 4, kif, &len, NULL, 0) < 0) {
-+ g_free(freep);
-+ return NULL;
-+ }
+ name[0] = CTL_KERN;
+ name[1] = KERN_PROC;
+ name[2] = KERN_PROC_FILEDESC;
+@@ -287,12 +295,25 @@ glibtop_get_proc_open_files_s (glibtop *
+ g_free(freep);
+ return NULL;
+ }
+#else
+ freep = kinfo_getfile(pid, &cnt);
+#endif
-+
-+ entries = g_array_new(FALSE, FALSE, sizeof(glibtop_open_files_entry));
-+
+
+ entries = g_array_new(FALSE, FALSE, sizeof(glibtop_open_files_entry));
+
+#ifndef HAVE_KINFO_GETFILE
-+ for (i = 0; i < len / sizeof(*kif); i++, kif++) {
-+ glibtop_open_files_entry entry = {0};
-+
+ for (i = 0; i < len / sizeof(*kif); i++, kif++) {
+ glibtop_open_files_entry entry = {0};
+
+ if (kif->kf_structsize != sizeof(*kif))
+ continue;
+#else
@@ -140,68 +54,6 @@
+ kif = &freep[i];
+#endif
+
-+ if (kif->kf_fd < 0)
-+ continue;
-+
-+ if (kif->kf_type == KF_TYPE_SOCKET) {
-+ if (kif->kf_sock_domain == AF_LOCAL) {
-+ struct sockaddr_un *sun;
-+
-+ entry.type = GLIBTOP_FILE_TYPE_LOCALSOCKET;
-+ sun = (struct sockaddr_un *)&kif->kf_sa_local;
-+
-+ if (sun->sun_path[0]) {
-+ char *addrstr;
-+
-+ addrstr = addr_to_string(&kif->kf_sa_local);
-+ g_strlcpy(entry.info.localsock.name,
-+ addrstr,
-+ sizeof(entry.info.localsock.name));
-+ g_free(addrstr);
-+ } else {
-+ char *addrstr;
-+
-+ addrstr = addr_to_string(&kif->kf_sa_peer);
-+ g_strlcpy(entry.info.localsock.name,
-+ addrstr,
-+ sizeof(entry.info.localsock.name));
-+ g_free(addrstr);
-+ }
-+ } else if (kif->kf_sock_domain == AF_INET ||
-+ kif->kf_sock_domain == AF_INET6) {
-+ char *addrstr;
-+
-+ entry.type = GLIBTOP_FILE_TYPE_INETSOCKET;
-+ addrstr = addr_to_string(&kif->kf_sa_peer);
-+ g_strlcpy(entry.info.sock.dest_host,
-+ addrstr,
-+ sizeof(entry.info.sock.dest_host));
-+ g_free(addrstr);
-+ entry.info.sock.dest_port = addr_to_port(&kif->kf_sa_peer);
-+ }
-+ } else if (kif->kf_type == KF_TYPE_PIPE) {
-+ entry.type = GLIBTOP_FILE_TYPE_PIPE;
-+ } else if (kif->kf_type == KF_TYPE_VNODE) {
-+ entry.type = GLIBTOP_FILE_TYPE_FILE;
-+ g_strlcpy(entry.info.file.name, kif->kf_path,
-+ sizeof(entry.info.file.name));
-+ } else
-+ continue;
-+
-+ entry.fd = kif->kf_fd;
-+
-+ g_array_append_val(entries, entry);
-+ }
-+ g_free(freep);
-+#else
-+
- output = execute_lsof(pid);
- if (output == NULL) return NULL;
-
- entries = parse_output(output);
-
- g_free(output);
-+#endif
+ if (kif->kf_fd < 0)
+ continue;
- buf->flags = _glibtop_sysdeps_proc_open_files;
- buf->number = entries->len;
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c b/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c
index 17d9f5ec1880..731fec120d39 100644
--- a/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c
@@ -1,112 +1,58 @@
---- sysdeps/freebsd/procwd.c.orig 2008-12-06 20:43:44.256309000 -0500
-+++ sysdeps/freebsd/procwd.c 2008-12-06 20:44:32.000000000 -0500
-@@ -24,7 +24,12 @@
- #include <glibtop_private.h>
-
- #include <sys/types.h>
-+#include <sys/sysctl.h>
+--- sysdeps/freebsd/procwd.c.orig 2008-08-18 11:23:36.000000000 -0400
++++ sysdeps/freebsd/procwd.c 2008-12-07 00:19:44.000000000 -0500
+@@ -27,6 +27,9 @@
+ #include <sys/sysctl.h>
#include <sys/param.h>
-+#include <sys/user.h>
+ #include <sys/user.h>
+#ifdef HAVE_KINFO_GETFILE
+#include <libutil.h>
+#endif
#include <string.h>
static const unsigned long _glibtop_sysdeps_proc_wd =
-@@ -38,6 +43,7 @@ _glibtop_init_proc_wd_s(glibtop *server)
- server->sysdeps.proc_wd = _glibtop_sysdeps_proc_wd;
- }
-
-+#if (__FreeBSD_version >= 800000 && __FreeBSD_version < 800019) || _FreeBSD_version < 700104
- static GPtrArray *
- parse_output(const char *output, glibtop_proc_wd *buf)
- {
-@@ -89,12 +95,25 @@ parse_output(const char *output, glibtop
-
- return dirs;
- }
-+#endif
-
- char**
- glibtop_get_proc_wd_s(glibtop *server, glibtop_proc_wd *buf, pid_t pid)
- {
- char path[MAXPATHLEN];
-+#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
-+ struct kinfo_file *freep, *kif;
-+ GPtrArray *dirs;
+@@ -101,10 +104,14 @@ glibtop_get_proc_wd_s(glibtop *server, g
+ #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
+ struct kinfo_file *freep, *kif;
+ GPtrArray *dirs;
+#ifndef HAVE_KINFO_GETFILE
-+ size_t len;
-+ int name[4];
-+#else
+ size_t len;
+- int i;
+ int name[4];
+ #else
+ int cnt;
+#endif
+ int i;
+#else
char *output;
-+#endif
-
- memset (buf, 0, sizeof (glibtop_proc_wd));
+ #endif
-@@ -102,6 +121,54 @@ glibtop_get_proc_wd_s(glibtop *server, g
- if (safe_readlink(path, buf->exe, sizeof(buf->exe)))
+@@ -115,6 +122,7 @@ glibtop_get_proc_wd_s(glibtop *server, g
buf->flags |= (1 << GLIBTOP_PROC_WD_EXE);
-+#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
+ #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
+#ifndef HAVE_KINFO_GETFILE
-+ name[0] = CTL_KERN;
-+ name[1] = KERN_PROC;
-+ name[2] = KERN_PROC_FILEDESC;
-+ name[3] = pid;
-+
-+ if (sysctl(name, 4, NULL, &len, NULL, 0) < 0)
-+ return NULL;
-+ freep = kif = g_malloc(len);
-+ if (sysctl(name, 4, kif, &len, NULL, 0) < 0) {
-+ g_free(freep);
-+ return NULL;
-+ }
+ name[0] = CTL_KERN;
+ name[1] = KERN_PROC;
+ name[2] = KERN_PROC_FILEDESC;
+@@ -127,10 +135,21 @@ glibtop_get_proc_wd_s(glibtop *server, g
+ g_free(freep);
+ return NULL;
+ }
+#else
+ freep = kinfo_getfile(pid, &cnt);
+#endif
-+
-+ dirs = g_ptr_array_sized_new(1);
-+
+
+ dirs = g_ptr_array_sized_new(1);
+
+#ifndef HAVE_KINFO_GETFILE
-+ for (i = 0; i < len / sizeof(*kif); i++, kif++) {
+ for (i = 0; i < len / sizeof(*kif); i++, kif++) {
+ if (kif->kf_structsize != sizeof(*kif))
+ continue;
+#else
+ for (i = 0; i < cnt; i++) {
+ kif = &freep[i];
+#endif
-+ switch (kif->kf_fd) {
-+ case KF_FD_TYPE_ROOT:
-+ g_strlcpy(buf->root, kif->kf_path,
-+ sizeof(buf->root));
-+ buf->flags |= (1 << GLIBTOP_PROC_WD_ROOT);
-+ break;
-+ case KF_FD_TYPE_CWD:
-+ g_ptr_array_add(dirs, g_strdup (kif->kf_path));
-+ break;
-+ }
-+ }
-+ g_free(freep);
-+
-+ buf->number = dirs->len;
-+ buf->flags |= (1 << GLIBTOP_PROC_WD_NUMBER);
-+
-+ g_ptr_array_add(dirs, NULL);
+
-+ return (char **)g_ptr_array_free(dirs, FALSE);
-+#else
- output = execute_lsof(pid);
- if (output != NULL) {
- GPtrArray *dirs;
-@@ -116,6 +183,7 @@ glibtop_get_proc_wd_s(glibtop *server, g
-
- return (char **)g_ptr_array_free(dirs, FALSE);
- }
-+#endif
-
- return NULL;
- }
+ switch (kif->kf_fd) {
+ case KF_FD_TYPE_ROOT:
+ g_strlcpy(buf->root, kif->kf_path,
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_shm_limits.c b/devel/libgtop/files/patch-sysdeps_freebsd_shm_limits.c
deleted file mode 100644
index 8fa00f388d8c..000000000000
--- a/devel/libgtop/files/patch-sysdeps_freebsd_shm_limits.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- sysdeps/freebsd/shm_limits.c.orig 2008-02-14 12:26:46.000000000 -0500
-+++ sysdeps/freebsd/shm_limits.c 2008-02-14 12:26:29.000000000 -0500
-@@ -25,6 +25,7 @@
- #include <glibtop/shm_limits.h>
-
- #include <sys/types.h>
-+#include <sys/param.h>
- #include <sys/sysctl.h>
-
- static unsigned long _glibtop_sysdeps_shm_limits =
-@@ -46,7 +47,11 @@ void
- glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf)
- {
- size_t len;
-+#if __FreeBSD_version < 700002
- int shmmax, shmmin, shmmni, shmseg, shmall;
-+#else
-+ unsigned long shmmax, shmmin, shmmni, shmseg, shmall;
-+#endif
-
- glibtop_init_s (&server, GLIBTOP_SYSDEPS_SHM_LIMITS, 0);
-
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_suid_open.c b/devel/libgtop/files/patch-sysdeps_freebsd_suid_open.c
new file mode 100644
index 000000000000..a188b364cbcd
--- /dev/null
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_suid_open.c
@@ -0,0 +1,94 @@
+--- sysdeps/freebsd/suid_open.c.orig 2008-09-29 17:22:12.000000000 -0400
++++ sysdeps/freebsd/suid_open.c 2008-09-29 17:23:35.000000000 -0400
+@@ -0,0 +1,91 @@
++/* Copyright (C) 1998 Joshua Sled
++ This file is part of LibGTop 1.0.
++
++ Contributed by Joshua Sled <jsled@xcf.berkeley.edu>, July 1998.
++
++ LibGTop 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.
++
++ LibGTop 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 LibGTop; see the file COPYING. If not, write to the
++ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++ Boston, MA 02111-1307, USA.
++*/
++
++#include <config.h>
++#include <glibtop.h>
++#include <glibtop/error.h>
++#include <glibtop/cpu.h>
++#include <glibtop/open.h>
++#include <glibtop/init_hooks.h>
++
++
++/* !!! THIS FUNCTION RUNS SUID ROOT - CHANGE WITH CAUTION !!! */
++
++void
++glibtop_init_p (glibtop *server, const unsigned long features,
++ const unsigned flags)
++{
++ const _glibtop_init_func_t *init_fkt;
++
++ if (server == NULL)
++ glibtop_error_r (NULL, "glibtop_init_p (server == NULL)");
++
++ /* Do the initialization, but only if not already initialized. */
++
++ if ((server->flags & _GLIBTOP_INIT_STATE_SYSDEPS) == 0) {
++ glibtop_open_p (server, "glibtop", features, flags);
++
++ for (init_fkt = _glibtop_init_hook_p; *init_fkt; init_fkt++)
++ (*init_fkt) (server);
++
++ server->flags |= _GLIBTOP_INIT_STATE_SYSDEPS;
++ }
++}
++
++void
++glibtop_open_p (glibtop *server, const char *program_name,
++ const unsigned long features,
++ const unsigned flags)
++{
++#ifdef DEBUG
++ fprintf (stderr, "DEBUG (%d): glibtop_open_p ()\n", getpid ());
++#endif
++
++ /* !!! WE ARE ROOT HERE - CHANGE WITH CAUTION !!! */
++ server->machine.uid = getuid ();
++ server->machine.euid = geteuid ();
++ server->machine.gid = getgid ();
++ server->machine.egid = getegid ();
++ /* Setup machine-specific data */
++ server->machine.kd = kvm_open (NULL, NULL, NULL, O_RDONLY, "kvm_open");
++
++ if (server->machine.kd == NULL)
++ glibtop_error_io_r (server, "kvm_open");
++
++ /* Drop priviledges. */
++
++ if (setreuid (server->machine.euid, server->machine.uid))
++ _exit (1);
++
++ if (setregid (server->machine.egid, server->machine.gid))
++ _exit (1);
++
++ /* !!! END OF SUID ROOT PART !!! */
++
++ /* Our effective uid is now those of the user invoking the server,
++ * so we do no longer have any priviledges. */
++
++ /* NOTE: On FreeBSD, we do not need to be suid root, we just need to
++ * be sgid kmem.
++ *
++ * The server will only use setegid() to get back it's priviledges,
++ * so it will fail if it is suid root and not sgid kmem. */
++}
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_sysinfo.c b/devel/libgtop/files/patch-sysdeps_freebsd_sysinfo.c
new file mode 100644
index 000000000000..ab5fdd66d5ee
--- /dev/null
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_sysinfo.c
@@ -0,0 +1,13 @@
+--- sysdeps/freebsd/sysinfo.c.orig 2008-05-23 18:13:23.000000000 -0400
++++ sysdeps/freebsd/sysinfo.c 2008-09-29 14:35:25.000000000 -0400
+@@ -45,8 +45,8 @@ init_sysinfo (glibtop *server)
+
+ glibtop_init_s (&server, GLIBTOP_SYSDEPS_CPU, 0);
+
+- len = sizeof (ncpus);
+- sysctlbyname ("hw.ncpu", &ncpus, &len, NULL, 0);
++ ncpus = server->ncpu + 1;
++
+ len = 0;
+ sysctlbyname ("hw.model", NULL, &len, NULL, 0);
+ model = g_malloc (len);
diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist
index 91e8d83abe47..fa5b9d29dda8 100644
--- a/devel/libgtop/pkg-plist
+++ b/devel/libgtop/pkg-plist
@@ -16,6 +16,7 @@ include/libgtop-2.0/glibtop/netload.h
include/libgtop-2.0/glibtop/open.h
include/libgtop-2.0/glibtop/parameter.h
include/libgtop-2.0/glibtop/ppp.h
+include/libgtop-2.0/glibtop/procaffinity.h
include/libgtop-2.0/glibtop/procargs.h
include/libgtop-2.0/glibtop/prockernel.h
include/libgtop-2.0/glibtop/proclist.h
@@ -158,7 +159,7 @@ share/locale/sk/LC_MESSAGES/libgtop-2.0.mo
share/locale/sl/LC_MESSAGES/libgtop-2.0.mo
share/locale/sq/LC_MESSAGES/libgtop-2.0.mo
share/locale/sr/LC_MESSAGES/libgtop-2.0.mo
-share/locale/sr@Latn/LC_MESSAGES/libgtop-2.0.mo
+share/locale/sr@latin/LC_MESSAGES/libgtop-2.0.mo
share/locale/sv/LC_MESSAGES/libgtop-2.0.mo
share/locale/ta/LC_MESSAGES/libgtop-2.0.mo
share/locale/te/LC_MESSAGES/libgtop-2.0.mo
@@ -179,6 +180,8 @@ share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
@dirrmtry share/locale/xh
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrmtry share/locale/oc/LC_MESSAGES
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 09:46:14 +0000