*** empty log message ***

po/Changelog: Changed to reflect this.

ChangeLog

@@ -1,54 +1,12 @@
-2005-12-15  Benoît Dejean  <benoit@placenet.org>
+2006-03-30  Guntupalli Karunakar  <karunakar@indlinux.org>
+
+        * configure.in: Added "dz" (Dzongkha) to ALL_LINGUAS.
+
+2006-02-21  Benoît Dejean  <benoit@placenet.org>
 
-	* configure.in:
 	* NEWS:
 	
-	Released 2.13.1.
+	Released 2.12.3.
-
-2005-12-13  Benoît Dejean  <benoit@placenet.org>
-
-	* NEWS:
-
-	Released 2.13.0.
-
-2005-12-12  James Henstridge  <james@jamesh.id.au>
-
-	* doc/auto-macros.texi.in: remove unused file.
-
-	* doc/libgtop2.texi: don't include auto-macros.texi.
-
-	* doc/Makefile.am: don't build auto-macros.texi, since none of its
-	macros are used in the documentation any more.
-
-	* include/glibtop/global.h: don't include <config.h> from headers.
-
-	* .../*.c: make sure <config.h> is the first thing included.
-
-	* acinclude.m4: m4_include() libgtop-sysdeps.m4 rather than
-	inlining it.
-
-	* acinclude.m4, libgtop-sysdeps.m4: use third argument to
-	AC_DEFINE() to set the comment.
-
-	* configure.in: modernise a bit.
-
-	* acconfig.h: remove file, since it is deprecated
-
-	* autogen.sh: require automake 1.9 instead of 1.4.
-
-2005-12-09  Benoît Dejean  <benoit@placenet.org>
-
-	* configure.in:
-	* glibtop.h:
-	* include/glibtop/cpu.h:
-	* include/glibtop/procmap.h:
-
-	Increased GLIBTOP_NCPU to 32.
-	Added real_ncpu to struct glibtop.
-	Added smaps members to glibtop_map_entry.
-
-	Bumped version number to 2.13.0
-	Broke ABI again. Sorry.
 
 2005-12-08  Benoît Dejean  <benoit@placenet.org>
 

NEWS

@@ -1,17 +1,7 @@
-December 15, 2005: Overview of changes in 2.13.1
+February 21, 2006: Overview of changes from 2.12.2 to 2.12.3
-================================================
+============================================================
-* linux:
+* Fixed documentation.
-    - fixed proclist
+* linux: glibtop_get_proc_map small optimization.
-    - implemented server->real_ncpu
-
-December 13, 2005: Overview of changes in 2.13.0
-================================================
-* Requires automake-1.9 (James Henstridge)
-* Supports up to 32 CPU
-* Supports Linux smaps
-* linux: fixed SMP detection
-
-This release is not ABI compatible with previous releases. Sorry.
 
 November 29, 2005: Overview of changes from 2.12.0 to 2.12.1
 ============================================================

acconfig.h

@@ -0,0 +1,168 @@
+
+/* Define if gethostname () must be declared. */
+#undef NEED_DECLARATION_GETHOSTNAME
+
+/* Define if setreuid () must be declared. */
+#undef NEED_DECLARATION_SETREUID
+
+/* Define if setregid () must be declared. */
+#undef NEED_DECLARATION_SETREGID
+
+/* Define if getpagesize () must be declared. */
+#undef NEED_DECLARATION_GETPAGESIZE
+
+/* Define if program_invocation_name must be declared. */
+#undef NEED_DECLARATION_PROGRAM_INVOCATION_NAME
+
+@TOP@
+
+#undef ENABLE_NLS
+#undef HAVE_CATGETS
+#undef GETTEXT_PACKAGE
+#undef HAVE_GETTEXT
+#undef HAVE_LC_MESSAGES
+#undef HAVE_STPCPY
+#undef HAVE_STRUCT_OSOCKADDR
+#undef PACKAGE
+#undef VERSION
+#undef HAVE_LIBSM
+#undef HAVE_LIBINTL_H
+#undef HAVE_GTK_SIGNAL_HANDLER_PENDING
+
+/* Do not remove this comments and the empty lines; they are needed */
+#undef HAVE_PROGRAM_INVOCATION_SHORT_NAME
+/* Define if you have the Andrew File System.  */
+#undef AFS
+
+/* Define one of the following to indicate how a program can
+   get a list of mounted filesystems.  */
+
+/* Define if there is no specific function for reading the list of
+   mounted filesystems.  fread will be used to read /etc/mnttab.  [SVR2]  */
+#undef MOUNTED_FREAD
+
+/* Define if (like SVR2) there is no specific function for reading the
+   list of mounted filesystems, and your system has these header files:
+   <sys/fstyp.h> and <sys/statfs.h>.  [SVR3]  */
+#undef MOUNTED_FREAD_FSTYP
+
+/* Define if there is a function named getfsstat for reading the list
+   of mounted filesystems.  [DEC Alpha running OSF/1]  */
+#undef MOUNTED_GETFSSTAT
+
+/* Define if there is a function named getmnt for reading the list of
+   mounted filesystems.  [Ultrix]  */
+#undef MOUNTED_GETMNT
+
+/* Define if there is a function named getmntent for reading the list
+   of mounted filesystems, and that function takes a single argument.
+   [4.3BSD, SunOS, HP-UX, Dynix, Irix]  */
+#undef MOUNTED_GETMNTENT1
+
+/* Define if there is a function named getmntent for reading the list of
+   mounted filesystems, and that function takes two arguments.  [SVR4]  */
+#undef MOUNTED_GETMNTENT2
+
+/* Define if there is a function named getmntinfo for reading the list
+   of mounted filesystems.  [4.4BSD]  */
+#undef MOUNTED_GETMNTINFO
+
+/* Define if there is a function named listmntent that can be used to
+   list all mounted filesystems. [UNICOS] */
+#undef MOUNTED_LISTMNTENT
+
+/* Define if there is a function named mntctl that can be used to read
+   the list of mounted filesystems, and there is a system header file
+   that declares `struct vmount.'  [AIX]  */
+#undef MOUNTED_VMOUNT
+
+/* Define one of the following to indicate how a program can obtain
+   filesystems usage information.  */
+
+/*  Define if  statfs takes 3 args.  [DEC Alpha running OSF/1]  */
+#undef STAT_STATFS3_OSF1
+
+/* Define if there is no specific function for reading filesystems usage
+   information and you have the <sys/filsys.h> header file.  [SVR2]  */
+#undef STAT_READ_FILSYS
+
+/* Define if statfs takes 2 args and struct statfs has a field named f_bsize.
+   [4.3BSD, SunOS 4, HP-UX, AIX PS/2]  */
+#undef STAT_STATFS2_BSIZE
+
+/* Define if statfs takes 2 args and struct statfs has a field named f_fsize.
+   [4.4BSD, NetBSD]  */
+#undef STAT_STATFS2_FSIZE
+
+/* Define if statfs takes 2 args and the second argument has
+   type struct fs_data.  [Ultrix]  */
+#undef STAT_STATFS2_FS_DATA
+
+/* Define if statfs takes 4 args.  [SVR3, Dynix, Irix, Dolphin]  */
+#undef STAT_STATFS4
+
+/* Define if there is a function named statvfs.  [SVR4]  */
+#undef STAT_STATVFS
+
+/* Define if the block counts reported by statfs may be truncated to 2GB
+   and the correct values may be stored in the f_spare array.
+   [SunOS 4.1.2, 4.1.3, and 4.1.3_U1 are reported to have this problem.
+   SunOS 4.1.1 seems not to be affected.]  */
+#undef STATFS_TRUNCATES_BLOCK_COUNTS
+
+
+/* to fix a bug in autoheader on DEC OSF1. */
+#undef HAVE_PROGRAM_INVOCATION_NAME
+
+#undef HAVE_SOCKETS
+#undef HAVE_SOCKADDR_SUN_LEN
+
+#undef HAVE_LIBJPEG
+#undef HAVE_LIBGIF
+#undef HAVE_LIBTIFF
+#undef HAVE_LIBZ
+#undef HAVE_LIBPNG
+#undef HAVE_GMP2_INCLUDE_DIR
+#undef HAVE_GUILE
+
+#undef ssize_t
+#undef guint64
+#undef int64_t
+
+#undef HAVE_GLIBTOP_MACHINE_H
+
+#undef GLIBTOP_GUILE
+#undef GLIBTOP_GUILE_NAMES
+#undef GLIBTOP_EXAMPLES
+#undef GLIBTOP_INODEDB
+
+#undef NEED_LIBGTOP
+
+#undef HAVE_LIBGTOP_SMP
+
+#undef HAVE_XAUTH
+
+/* Define if your have the I4B package. */
+#undef HAVE_I4B
+#undef HAVE_I4B_ACCT
+
+/* Define to enable debugging. */
+#undef LIBGTOP_ENABLE_DEBUG
+#undef LIBGTOP_FATAL_WARNINGS
+
+/* Same as LINUX_VERSION_CODE either from <linux/version.h> or from
+ * the running kernel (if we don't have configured kernel sources).
+ */
+#undef GLIBTOP_LINUX_VERSION_CODE
+
+/* Solaris release code (eg. 251 for Solaris 2.5.1). */
+#undef GLIBTOP_SOLARIS_RELEASE
+
+/* Define if you want to use LibGTop without GNOME. */
+#undef WITHOUT_GNOME
+
+/* Define if you have the <procfs.h> header file */
+#undef HAVE_PROCFS_H
+
+/* Define if you have the <sys/procfs.h> header file */
+#undef HAVE_SYS_PROCFS_H

acinclude.m4

@@ -30,7 +30,7 @@ changequote([,]), [#include <sys/types.h>
 ], ac_cv_type_$1=yes, ac_cv_type_$1=no)])dnl
 AC_MSG_RESULT($ac_cv_type_$1)
 if test $ac_cv_type_$1 = no; then
-  AC_DEFINE($1, $2, [Define to $2 if <sys/types.h> does not define.])
+  AC_DEFINE($1, $2)
 fi
 ])
 
@@ -72,7 +72,7 @@ if eval "test \"`echo '$gcc_cv_decl_needed_'$1`\" = yes"; then
   AC_MSG_RESULT(yes)
   gcc_need_declarations="$gcc_need_declarations $1"
   gcc_tr_decl=NEED_DECLARATION_`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  AC_DEFINE_UNQUOTED($gcc_tr_decl, 1, [Define if $1 () must be declared.])
+  AC_DEFINE_UNQUOTED($gcc_tr_decl)
 else
   AC_MSG_RESULT(no)
 fi
@@ -157,8 +157,7 @@ yes
 AC_MSG_RESULT($fu_cv_sys_mounted_cray_listmntent)
 if test $fu_cv_sys_mounted_cray_listmntent = yes; then
 list_mounted_fs=found
-AC_DEFINE(MOUNTED_LISTMNTENT, 1,
+AC_DEFINE(MOUNTED_LISTMNTENT)
-          [Define if there is a function named listmntent that can be used to list all mounted filesystems. [UNICOS]])
 fi
 fi
 
@@ -177,8 +176,7 @@ AC_CACHE_VAL(fu_cv_sys_mounted_getmntent1,
 AC_MSG_RESULT($fu_cv_sys_mounted_getmntent1)
 if test $fu_cv_sys_mounted_getmntent1 = yes; then
 list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETMNTENT1, 1,
+AC_DEFINE(MOUNTED_GETMNTENT1)
-          [Define if there is a function named getmntent for reading the list of mounted filesystems, and that function takes a single argument. [4.3BSD, SunOS, HP-UX, Dynix, Irix]])
 fi
 fi
 
@@ -192,8 +190,7 @@ fu_cv_sys_mounted_getmntent2=no)])
 AC_MSG_RESULT($fu_cv_sys_mounted_getmntent2)
 if test $fu_cv_sys_mounted_getmntent2 = yes; then
 list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETMNTENT2, 1,
+AC_DEFINE(MOUNTED_GETMNTENT2)
-          [Define if there is a function named getmntent for reading the list of mounted filesystems, and that function takes two arguments.  [SVR4]])
 fi
 fi
 
@@ -218,8 +215,7 @@ fu_cv_sys_mounted_getsstat=no)])
 AC_MSG_RESULT($fu_cv_sys_mounted_getsstat)
 if test $fu_cv_sys_mounted_getsstat = yes; then
 list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETFSSTAT, 1,
+AC_DEFINE(MOUNTED_GETFSSTAT)
-          [Define if there is a function named getfsstat for reading the list of mounted filesystems.  [DEC Alpha running OSF/1]])
 fi
 fi
 
@@ -233,8 +229,7 @@ fu_cv_sys_mounted_vmount=no)])
 AC_MSG_RESULT($fu_cv_sys_mounted_vmount)
 if test $fu_cv_sys_mounted_vmount = yes; then
 list_mounted_fs=found
-AC_DEFINE(MOUNTED_VMOUNT, 1,
+AC_DEFINE(MOUNTED_VMOUNT)
-          [Define if there is a function named mntctl that can be used to read the list of mounted filesystems, and there is a system header file that declares `struct vmount.'  [AIX]])
 fi
 fi
 
@@ -251,8 +246,7 @@ fu_cv_sys_mounted_fread_fstyp=no)])
 AC_MSG_RESULT($fu_cv_sys_mounted_fread_fstyp)
 if test $fu_cv_sys_mounted_fread_fstyp = yes; then
 list_mounted_fs=found
-AC_DEFINE(MOUNTED_FREAD_FSTYP, 1,
+AC_DEFINE(MOUNTED_FREAD_FSTYP)
-          [Define if (like SVR2) there is no specific function for reading the list of mounted filesystems, and your system has these header files: <sys/fstyp.h> and <sys/statfs.h>.  [SVR3]])
 fi
 fi
 
@@ -273,8 +267,7 @@ test -n "$ok" \
 AC_MSG_RESULT($fu_cv_sys_mounted_getmntinfo)
 if test $fu_cv_sys_mounted_getmntinfo = yes; then
 list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETMNTINFO, 1,
+AC_DEFINE(MOUNTED_GETMNTINFO)
-          [Define if there is a function named getmntinfo for reading the list of mounted filesystems.  [4.4BSD]])
 fi
 fi
 
@@ -292,8 +285,7 @@ fu_cv_sys_mounted_getmnt=no)])
 AC_MSG_RESULT($fu_cv_sys_mounted_getmnt)
 if test $fu_cv_sys_mounted_getmnt = yes; then
 list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETMNT, 1,
+AC_DEFINE(MOUNTED_GETMNT)
-          [Define if there is a function named getmnt for reading the list of mounted filesystems.  [Ultrix]])
 fi
 fi
 
@@ -307,8 +299,7 @@ fu_cv_sys_mounted_fread=no)])
 AC_MSG_RESULT($fu_cv_sys_mounted_fread)
 if test $fu_cv_sys_mounted_fread = yes; then
 list_mounted_fs=found
-AC_DEFINE(MOUNTED_FREAD, 1,
+AC_DEFINE(MOUNTED_FREAD)
-          [Define if there is no specific function for reading the list of mounted filesystems.  fread will be used to read /etc/mnttab.  [SVR2]])
 fi
 fi
 
@@ -337,8 +328,7 @@ fu_cv_sys_stat_statvfs=yes,
 fu_cv_sys_stat_statvfs=no)])
 if test $fu_cv_sys_stat_statvfs = yes; then
 space=yes
-AC_DEFINE(STAT_STATVFS, 1,
+AC_DEFINE(STAT_STATVFS)
-          [Define if there is a function named statvfs.  [SVR4]])
 fi
 fi
 
@@ -362,8 +352,7 @@ fu_cv_sys_stat_statfs3_osf1=no)])
 AC_MSG_RESULT($fu_cv_sys_stat_statfs3_osf1)
 if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
 space=yes
-AC_DEFINE(STAT_STATFS3_OSF1, 1,
+AC_DEFINE(STAT_STATFS3_OSF1)
-          [Define if  statfs takes 3 args.  [DEC Alpha running OSF/1]])
 fi
 fi
 
@@ -394,8 +383,7 @@ fu_cv_sys_stat_statfs2_bsize=no)])
 AC_MSG_RESULT($fu_cv_sys_stat_statfs2_bsize)
 if test $fu_cv_sys_stat_statfs2_bsize = yes; then
 space=yes
-AC_DEFINE(STAT_STATFS2_BSIZE, 1,
+AC_DEFINE(STAT_STATFS2_BSIZE)
-          [Define if statfs takes 2 args and struct statfs has a field named f_bsize. [4.3BSD, SunOS 4, HP-UX, AIX PS/2]])
 fi
 fi
 
@@ -416,8 +404,7 @@ fu_cv_sys_stat_statfs4=no)])
 AC_MSG_RESULT($fu_cv_sys_stat_statfs4)
 if test $fu_cv_sys_stat_statfs4 = yes; then
 space=yes
-AC_DEFINE(STAT_STATFS4, 1,
+AC_DEFINE(STAT_STATFS4)
-          [Define if statfs takes 4 args.  [SVR3, Dynix, Irix, Dolphin]])
 fi
 fi
 
@@ -445,8 +432,7 @@ fu_cv_sys_stat_statfs2_fsize=no)])
 AC_MSG_RESULT($fu_cv_sys_stat_statfs2_fsize)
 if test $fu_cv_sys_stat_statfs2_fsize = yes; then
 space=yes
-AC_DEFINE(STAT_STATFS2_FSIZE, 1,
+AC_DEFINE(STAT_STATFS2_FSIZE)
-          [Define if statfs takes 2 args and struct statfs has a field named f_fsize. [4.4BSD, NetBSD]])
 fi
 fi
 
@@ -477,17 +463,14 @@ fu_cv_sys_stat_fs_data=no)])
 AC_MSG_RESULT($fu_cv_sys_stat_fs_data)
 if test $fu_cv_sys_stat_fs_data = yes; then
 space=yes
-AC_DEFINE(STAT_STATFS2_FS_DATA, 1,
+AC_DEFINE(STAT_STATFS2_FS_DATA)
-          [Define if statfs takes 2 args and the second argument has type struct fs_data.  [Ultrix]])
 fi
 fi
 
 if test $space = no; then
 # SVR2
 AC_TRY_CPP([#include <sys/filsys.h>],
-AC_DEFINE(STAT_READ_FILSYS, 1,
+AC_DEFINE(STAT_READ_FILSYS) space=yes)
-          [Define if there is no specific function for reading filesystems usage information and you have the <sys/filsys.h> header file.  [SVR2]])
-space=yes)
 fi
 
 if test -n "$list_mounted_fs" && test $space != no; then
@@ -512,14 +495,260 @@ fu_cv_sys_truncating_statfs=yes,
 fu_cv_sys_truncating_statfs=no,
 )])
 if test $fu_cv_sys_truncating_statfs = yes; then
-AC_DEFINE(STATFS_TRUNCATES_BLOCK_COUNTS, 1,
+AC_DEFINE(STATFS_TRUNCATES_BLOCK_COUNTS)
-          [Define if the block counts reported by statfs may be truncated to 2GB and the correct values may be stored in the f_spare array. [SunOS 4.1.2, 4.1.3, and 4.1.3_U1 are reported to have this problem. SunOS 4.1.1 seems not to be affected.]])
 fi
 AC_MSG_RESULT($fu_cv_sys_truncating_statfs)
 
 AC_CHECKING(for AFS)
-test -d /afs && AC_DEFINE(AFS, 1, [Define if you have the Andrew File System.])
+test -d /afs && AC_DEFINE(AFS)
 ])
 
 
-m4_include([libgtop-sysdeps.m4])
+dnl This file is intended for use both internally in libgtop and in every program
+dnl that wants to use it.
+dnl
+dnl It defines the following variables:
+dnl
+dnl * 'libgtop_sysdeps_dir'    - sysdeps dir for libgtop.
+dnl * 'libgtop_use_machine_h'  - some of system dependend parts of libgtop provide
+dnl                              their own header file. In this case we need to
+dnl                              define 'HAVE_GLIBTOP_MACHINE_H'.
+dnl * 'libgtop_need_server'    - is the server really needed? Defines 'NEED_LIBGTOP'
+dnl                              if true; defines conditional 'NEED_LIBGTOP'.
+
+AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
+	AC_REQUIRE([AC_CANONICAL_HOST])
+
+	AC_SUBST(libgtop_sysdeps_dir)
+	AC_SUBST(libgtop_use_machine_h)
+	AC_SUBST(libgtop_need_server)
+
+	AC_ARG_WITH(libgtop-examples,
+	[  --with-libgtop-examples Build the libgtop examples (default=no)],[
+	build_examples="$withval"], [build_examples=no])
+
+	AM_CONDITIONAL(EXAMPLES, test x"$build_examples" = xyes)
+
+	AC_ARG_ENABLE(hacker-mode,
+	[  --enable-hacker-mode    Enable building of unstable sysdeps],
+	[hacker_mode="$enableval"], [hacker_mode=no])
+
+	AM_CONDITIONAL(HACKER_MODE, test x"$hacker_mode" = xyes)
+
+	if test x$hacker_mode = xyes ; then
+	  LIBGTOP_HACKER_TESTS
+	fi
+
+	AC_ARG_WITH(libgtop-smp,
+	[  --with-libgtop-smp      Enable SMP support (default-auto)],[
+	libgtop_smp="$withval"],[libgtop_smp=auto])
+
+	if test $libgtop_smp = auto ; then
+	  AC_MSG_CHECKING(whether to enable SMP support)
+	  case "$host_os" in
+	  linux*)
+	    libgtop_smp=yes
+	    ;;
+	  aix*)
+	    libgtop_smp=yes
+	    ;;
+	  *)
+	    libgtop_smp=no
+	    ;;
+	  esac
+	  AC_MSG_RESULT($libgtop_smp)
+	fi
+
+	if test $libgtop_smp = yes ; then
+	  AC_DEFINE(HAVE_LIBGTOP_SMP)
+	fi
+
+	AM_CONDITIONAL(LIBGTOP_SMP, test $libgtop_smp = yes)
+
+	AC_MSG_CHECKING(for libgtop sysdeps directory)
+
+	case "$host_os" in
+	linux*)
+	  libgtop_sysdeps_dir=linux
+	  libgtop_use_machine_h=no
+	  libgtop_have_sysinfo=yes
+	  libgtop_need_server=no
+	  ;;
+	freebsd*|netbsd*|openbsd*|bsdi*)
+	  libgtop_sysdeps_dir=freebsd
+	  libgtop_use_machine_h=yes
+	  libgtop_need_server=yes
+	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
+	  ;;
+	solaris*)
+	  libgtop_sysdeps_dir=solaris
+	  libgtop_use_machine_h=yes
+	  libgtop_need_server=yes
+	  libgtop_postinstall='chgrp sys $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
+	  ;;
+        aix*)
+	  libgtop_sysdeps_dir=aix
+	  libgtop_use_machine_h=yes
+	  libgtop_need_server=yes
+	  libgtop_have_sysinfo=yes
+	  libgtop_postinstall='chgrp system $(bindir)/libgtop_server && chmod g+s $(bindir)/libgtop_server2'
+          ;;
+	*)
+	  if test x$hacker_mode = xyes ; then
+	    case "$host_os" in
+	    sunos4*)
+	      #Please note that this port is obsolete and not working at
+	      #all. It is only useful for people who want to fix it ... :-)
+	      libgtop_sysdeps_dir=sun4
+	      libgtop_use_machine_h=yes
+	      libgtop_need_server=yes
+	      ;;
+	    osf*)
+	      libgtop_sysdeps_dir=osf1
+	      libgtop_use_machine_h=yes
+	      libgtop_need_server=yes
+	      ;;
+	    *)
+	      libgtop_sysdeps_dir=stub
+	      libgtop_use_machine_h=no
+	      libgtop_need_server=no
+	      ;;
+	    esac
+	  else
+	    libgtop_sysdeps_dir=stub
+	    libgtop_use_machine_h=no
+	    libgtop_need_server=no
+	  fi
+	  ;;
+	esac
+
+	test -z "$libgtop_postinstall" && libgtop_postinstall=:
+
+	AC_MSG_RESULT($libgtop_sysdeps_dir)
+
+	AC_SUBST(libgtop_sysdeps_dir)
+	AC_SUBST(libgtop_postinstall)
+	AC_SUBST(libgtop_have_sysinfo)
+
+	case "$host_os" in
+	*bsd*)
+	  AC_CHECK_HEADERS(net/if_var.h)
+	  AC_MSG_CHECKING([for I4B])
+	  AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <net/if.h>
+#include <net/if_types.h>
+
+#ifdef HAVE_NET_IF_VAR_H
+#include <net/if_var.h>
+#endif
+
+#include <net/netisr.h>
+#include <net/route.h>
+
+#if defined(__FreeBSD__) || defined(__NetBSD__)
+#include <net/if_sppp.h>
+#else
+#include <i4b/sppp/if_sppp.h>
+#endif
+],[
+	size_t size = sizeof (struct sppp);
+], have_i4b=yes, have_i4b=no)
+	  AC_MSG_RESULT($have_i4b)
+	  if test x$have_i4b = xyes; then
+	    AC_DEFINE(HAVE_I4B)
+	    AC_MSG_CHECKING([for I4B accounting])
+	    AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <net/if.h>
+#include <net/if_types.h>
+
+#ifdef HAVE_NET_IF_VAR_H
+#include <net/if_var.h>
+#endif
+
+#include <net/netisr.h>
+#include <net/route.h>
+
+#if defined(__FreeBSD__) || defined(__NetBSD__)
+#include <net/if_sppp.h>
+#else
+#include <i4b/sppp/if_sppp.h>
+#endif
+
+#include <machine/i4b_acct.h>
+],[
+	size_t size = sizeof (struct i4bisppp_softc);
+], have_i4b_acct=yes, have_i4b_acct=no)
+	    AC_MSG_RESULT($have_i4b_acct)
+	    if test x$have_i4b_acct = xyes ; then
+	      AC_DEFINE(HAVE_I4B_ACCT)
+	    else
+	      AC_WARN([
+*** I4B accounting disabled - you won't get any PPP statistics.
+*** Read "misc/i4b_acct.txt" in the LibGTop source directory
+*** to see how to enable it.])
+	    fi
+	  fi
+	  ;;
+	linux*)
+	  os_major_version=`uname -r | sed 's/-pre[[0-9]]*//' | \
+	    sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+	  os_minor_version=`uname -r | sed 's/-pre[[0-9]]*//' | \
+	    sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+	  os_micro_version=`uname -r | sed 's/-pre[[0-9]]*//' | \
+	    sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+	  os_version_expr="$os_major_version 65536 * $os_minor_version 256 * + $os_micro_version + p q"
+
+	  AC_CHECK_HEADERS(linux/version.h, have_linux_version_h=yes,
+	    have_linux_version_h=no)
+
+	  if test x$have_linux_version_h = xyes ; then
+	    version_code=`cat /usr/include/linux/version.h | \
+	      grep \#define | grep LINUX_VERSION_CODE`
+	    os_version_code=`echo $version_code | \
+	      sed 's/^.*LINUX_VERSION_CODE[[ \t]]*\([[0-9]]*\).*$/\1/'`
+	  else
+	    os_version_code=`echo "$os_version_expr" | dc`
+	  fi
+
+	  AC_MSG_CHECKING(for Linux kernel version code)
+	  AC_DEFINE_UNQUOTED(GLIBTOP_LINUX_VERSION_CODE, $os_version_code)
+	  AC_MSG_RESULT($os_version_code)
+	  ;;
+	solaris*)
+	  os_major_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\1/'`
+	  os_minor_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\2/'`
+	  os_micro_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\3/'`
+	  test -z "$os_micro_version" && os_micro_version=0
+	  os_version_expr="$os_major_version 100 * $os_minor_version 10 * + $os_micro_version + p q"
+	  os_version_code=`echo "$os_version_expr" | dc`
+
+	  AC_MSG_CHECKING(for Solaris release code)
+	  AC_DEFINE_UNQUOTED(GLIBTOP_SOLARIS_RELEASE, $os_version_code)
+	  AC_MSG_RESULT($os_version_code)
+	  ;;
+	esac
+
+	AC_MSG_CHECKING(for machine.h in libgtop sysdeps dir)
+	AC_MSG_RESULT($libgtop_use_machine_h)
+
+	AC_MSG_CHECKING(whether we need libgtop)
+	AC_MSG_RESULT($libgtop_need_server)
+
+	if test x$libgtop_need_server = xyes ; then
+	  AC_DEFINE(NEED_LIBGTOP)
+	fi
+
+	if test x$libgtop_use_machine_h = xyes ; then
+	  AC_DEFINE(HAVE_GLIBTOP_MACHINE_H)
+	fi
+
+	AM_CONDITIONAL(NEED_LIBGTOP, test x$libgtop_need_server = xyes)
+])
+
+  

autogen.sh

@@ -18,5 +18,4 @@ which gnome-autogen.sh || {
     echo "You need to install gnome-common from the GNOME CVS"
     exit 1
 }
-REQUIRED_AUTOMAKE_VERSION=1.9
+USE_GNOME2_MACROS=1 . gnome-autogen.sh
-. gnome-autogen.sh

configure.in

@@ -2,49 +2,59 @@ dnl
 dnl Configure script for the Gnome library
 dnl
 
-m4_define([libgtop_major_version], [2])
+AC_INIT(copyright.txt)
-m4_define([libgtop_minor_version], [13])
+AM_CONFIG_HEADER(config.h)
-m4_define([libgtop_micro_version], [1])
+AC_CANONICAL_SYSTEM
-m4_define([libgtop_version], [libgtop_major_version.libgtop_minor_version.libgtop_micro_version])
+
+LIBGTOP_MAJOR_VERSION=2
+LIBGTOP_MINOR_VERSION=12
+LIBGTOP_MICRO_VERSION=3
+LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION
+AM_INIT_AUTOMAKE(libgtop, $LIBGTOP_VERSION)
 
 dnl  increment if the interface has additions, changes, removals.
-m4_define([libgtop_current], [7])
+LIBGTOP_CURRENT=6
 
 dnl  increment any time the source changes; set to
 dnl  0 if you increment CURRENT
-m4_define([libgtop_revision], [0])
+LIBGTOP_REVISION=0
 
 dnl  increment if any interfaces have been added; set to 0
 dnl  if any interfaces have been removed. removal has
 dnl  precedence over adding, so set to 0 if both happened.
-m4_define([libgtop_age], [0])
+LIBGTOP_AGE=1
+
+# you can set this to `-snap' for instance to create
+# a `libgtop-1.x.y-snap.tar.gz' tarball.
+LIBGTOP_VERSION_SUFFIX=
 
 # Increase each time you change the client/server protocol.
-m4_define([libgtop_server_version], [5])
+LIBGTOP_SERVER_VERSION=5
 
 # Version code calculation
-m4_define([libgtop_version_code], [m4_eval(libgtop_major_version * 1000000 + libgtop_minor_version * 1000 + libgtop_micro_version)])
+LIBGTOP_VERSION_CODE=`expr $LIBGTOP_MAJOR_VERSION \* 1000000 + $LIBGTOP_MINOR_VERSION \* 1000 + $LIBGTOP_MICRO_VERSION`
 
-AC_INIT([libgtop], [libgtop_version],
+AC_SUBST(LIBGTOP_MAJOR_VERSION)
-        [http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop])
+AC_SUBST(LIBGTOP_MINOR_VERSION)
-AC_CONFIG_SRCDIR(copyright.txt)
+AC_SUBST(LIBGTOP_MICRO_VERSION)
-AC_CONFIG_HEADERS(config.h)
+AC_SUBST(LIBGTOP_INTERFACE_AGE)
-
+AC_SUBST(LIBGTOP_BINARY_AGE)
-AC_CANONICAL_SYSTEM
+AC_SUBST(LIBGTOP_SERVER_VERSION)
-
+AC_SUBST(LIBGTOP_VERSION)
-AM_INIT_AUTOMAKE
+AC_SUBST(LIBGTOP_VERSION_CODE)
-AC_SUBST(ACLOCAL_AMFLAGS, [\${ACLOCAL_FLAGS}])
+AC_SUBST(LIBGTOP_VERSION_SUFFIX)
-
-AC_SUBST(LIBGTOP_MAJOR_VERSION, [libgtop_major_version])
-AC_SUBST(LIBGTOP_MINOR_VERSION, [libgtop_minor_version])
-AC_SUBST(LIBGTOP_MICRO_VERSION, [libgtop_micro_version])
-AC_SUBST(LIBGTOP_SERVER_VERSION, [libgtop_server_version])
-AC_SUBST(LIBGTOP_VERSION, [libgtop_version])
-AC_SUBST(LIBGTOP_VERSION_CODE, [libgtop_version_code])
 
 # libtool versioning
-AC_SUBST(LT_VERSION_INFO,
+LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION
-         [-version-info libgtop_current:libgtop_revision:libgtop_age])
+LT_CURRENT=$LIBGTOP_CURRENT
+LT_REVISION=$LIBGTOP_REVISION
+LT_AGE=$LIBGTOP_AGE
+LT_VERSION_INFO="-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}"
+AC_SUBST(LT_VERSION_INFO)
+AC_SUBST(LT_RELEASE)
+AC_SUBST(LT_CURRENT)
+AC_SUBST(LT_REVISION)
+AC_SUBST(LT_AGE)
 
 ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I ."
 
@@ -99,8 +109,7 @@ fi
 AM_CONDITIONAL(INODEDB, test x$build_inodedb = xyes)
 
 if test x$build_inodedb = xyes ; then
-  AC_DEFINE(GLIBTOP_INODEDB, 1,
+  AC_DEFINE(GLIBTOP_INODEDB)
-            [Define if the libgtop inodedb should be built])
 fi
 
 GLIB_REQUIRED=2.6.0
@@ -161,9 +170,8 @@ if test x$HAVE_ISDN_H = xyes ; then
 fi
 
 dnl AIX
-AC_CHECK_LIB(perfstat, vmgetinfo,
+AH_TEMPLATE(HAVE_VMGETINFO, [Define to 1 if you have the 'vmgetinfo' function in libperfstat])
-    AC_DEFINE(HAVE_VMGETINFO, 1,
+AC_CHECK_LIB(perfstat, vmgetinfo, AC_DEFINE(HAVE_VMGETINFO))
-        [Define to 1 if you have the 'vmgetinfo' function in libperfstat]))
 
 dnl Solaris
 case "$host_os" in
@@ -212,7 +220,7 @@ CFLAGS=$saved_CFLAGS
 AC_CHECK_FUNC(socket,
  [AC_CHECK_HEADER(netinet/in.h,
    [AC_CHECK_HEADER(arpa/inet.h, [
-  AC_DEFINE(HAVE_SOCKETS, 1, [Define if BSD sockets are supported])
+  AC_DEFINE(HAVE_SOCKETS)
       AC_MSG_CHECKING("for sun_len member in struct sockaddr_un")
       AC_TRY_LINK([
 #include <sys/types.h>
@@ -220,7 +228,7 @@ AC_CHECK_FUNC(socket,
 #include <sys/un.h>
       ],
       [static struct sockaddr_un x; x.sun_len = 1;],
-      [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SOCKADDR_SUN_LEN, 1, [Define if struct sockaddr_un has a sun_len member])],
+      [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SOCKADDR_SUN_LEN)],
       [AC_MSG_RESULT(no)])])])])
 
 dnl Checks for library functions.
@@ -230,15 +238,13 @@ AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname)
 
-ALL_LINGUAS="am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id it ja ko ku ky lt lv mi mk ml mn ms nb ne nl nn no or pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv ta th tr uk vi xh zh_CN zh_TW"
+ALL_LINGUAS="am ar az be bg bn bs ca cs cy da de dz el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id it ja ko ku ky lt lv mi mk ml mn ms nb ne nl nn no or pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv ta th tr uk vi xh zh_CN zh_TW"
 
 GETTEXT_PACKAGE=libgtop-2.0
 AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")
-                   [Define to the gettext package used by the library])
 
 AM_GLIB_GNU_GETTEXT
-GLIB_DEFINE_LOCALEDIR([GTOPLOCALEDIR])
 
 AC_PATH_XTRA
 
@@ -265,7 +271,7 @@ test -z "$with_xauth" && { AC_CHECK_HEADER(X11/Xauth.h,          ,with_xauth=no)
 test -z "$with_xauth" && { AC_CHECK_LIB(Xau, XauGetAuthByAddr,[:],with_xauth=no, $X_LIBS) }
 test -z "$with_xauth" && with_xauth=yes
 if test "$with_xauth" = "yes"; then
-  AC_DEFINE(HAVE_XAUTH, 1, [Define if Xauth is supported])
+  AC_DEFINE(HAVE_XAUTH)
   XE_SPACE(libs_xauth, $X_LIBS -lXau)
 fi
 CPPFLAGS="$saved_CPPFLAGS"
@@ -275,8 +281,8 @@ dnl For diskusage stuff
 GNOME_FILEUTILS_CHECKS
 
 dnl Debugging
-AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging [default=no]],AC_DEFINE(LIBGTOP_ENABLE_DEBUG, 1, [Define to enable debugging]),)
+AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging [default=no]],AC_DEFINE(LIBGTOP_ENABLE_DEBUG),)
-AC_ARG_ENABLE(fatal-warnings, [  --enable-fatal-warnings make all warnings fatal [debug=no]],AC_DEFINE(LIBGTOP_FATAL_WARNINGS, 1, [Define to enable fatal warnings]),)
+AC_ARG_ENABLE(fatal-warnings, [  --enable-fatal-warnings make all warnings fatal [debug=no]],AC_DEFINE(LIBGTOP_FATAL_WARNINGS),)
 
 dnl These definitions are expanded in make.
 LIBGTOP_LIBS='-L$(libdir)'
@@ -300,14 +306,8 @@ fi
 
 LIBGTOP_INCS="$LIBGTOP_INCS $GLIB_CFLAGS"
 
-libgtop_save_prefix="$prefix"
+LIBGTOP_BINDIR='$(bindir)'
-libgtop_save_exec_prefix="$exec_prefix"
+LIBGTOP_SERVER='$(bindir)/libgtop_server2'
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-LIBGTOP_BINDIR=`eval echo "${bindir}"`
-LIBGTOP_SERVER=`eval echo "${bindir}/libgtop_server2"`
-prefix="$libgtop_save_prefix"
-exec_prefix="$libgtop_save_exec_prefix"
 
 sysdeps_dir="$libgtop_sysdeps_dir"
 AC_SUBST(sysdeps_dir)
@@ -340,24 +340,7 @@ if test "$GCC" = "yes" ; then
 	$CFLAGS"
 fi
 
-INCLUDES="-I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include $GLIB_CFLAGS $X_CFLAGS"
+INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include $GLIB_CFLAGS $CFLAGS $X_CFLAGS "'-DGTOPLOCALEDIR=\"$(datadir)/locale\" -DLIBGTOP_VERSION=\"'"$LIBGTOP_VERSION"'\" -DLIBGTOP_SERVER_VERSION=\"'"$LIBGTOP_SERVER_VERSION"'\" -DLIBGTOP_VERSION_CODE='$LIBGTOP_VERSION_CODE' -DLIBGTOP_SERVER=\"'"$LIBGTOP_SERVER"'\"'
-
-# Add various defines to the config.h file ...
-AH_VERBATIM([_GNU_SOURCE],
-[/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-#  define _GNU_SOURCE
-#endif])
-AC_DEFINE([_IN_LIBGTOP], 1,
-          [Note that we are building libgtop rather than using it])
-AC_DEFINE([LIBGTOP_VERSION], ["libgtop_version"],
-          [The libgtop version number])
-AC_DEFINE([LIBGTOP_SERVER_VERSION], ["libgtop_server_version"],
-          [The libgtop server version])
-AC_DEFINE([LIBGTOP_VERSION_CODE], [libgtop_version_code],
-          [The libgtop version number as an integer])
-AC_DEFINE_UNQUOTED([LIBGTOP_SERVER], ["$LIBGTOP_SERVER"],
-                   [The path to the libgtop server])
 
 AC_SUBST(INCLUDES)
 
@@ -378,7 +361,7 @@ fi
 AC_SUBST(sysdeps_suid_lib)
 AC_SUBST(server_programs)
 
-AC_CONFIG_FILES([
+AC_OUTPUT([
 Makefile
 libgtop.spec
 po/Makefile.in
@@ -404,5 +387,3 @@ doc/Makefile
 libgtop-2.0.pc
 libgtopconfig.h
 ])
-
-AC_OUTPUT

doc/ChangeLog

@@ -1,3 +1,7 @@
+2006-02-21  Benoît Dejean  <benoit@placenet.org>
+
+	* reference.texi: Fixed reference to glibtop/procstate.h
+
 2005-01-03  Benoît Dejean  <TazForEver@dlfp.org>
 
 	* reference.texi: Updated.

doc/Makefile.am

@@ -1,6 +1,38 @@
 info_TEXINFOS		= libgtop2.texi
 
 libgtop2_TEXINFOS	= libgtop2.texi about.texi reference.texi \
-			  version.texi main.texi white-paper.texi
+			  auto-macros.texi version.texi main.texi \
+			  white-paper.texi
 
-AM_MAKEINFOFLAGS	= -I $(libgtop_top_builddir)/doc
+MAKEINFO		= @MAKEINFO@ -I @libgtop_top_builddir@/doc
+
+EXTRA_DIST		= auto-macros.texi.in
+
+auto-macros.texi: auto-macros.texi.in Makefile
+## Use sed and then mv to avoid problems if the user interrupts.
+	sed -e 's#\%LIBGTOP_LIBDIR\%#$(libdir)#g' \
+	  -e 's#\%LIBGTOP_INCLUDEDIR\%#$(includedir)/libgtop-2.0#g' \
+	  -e 's#\%LIBGTOP_DATADIR\%#$(datadir)#g' \
+	  -e 's#\%LIBGTOP_EXTRA_LIBS\%#$(LIBGTOP_EXTRA_LIBS)#g' \
+	  -e 's#\%LIBGTOP_LIBS\%#$(LIBGTOP_LIBS)#g' \
+	  -e 's#\%LIBGTOP_INCS\%#$(LIBGTOP_INCS)#g' \
+	  -e 's#\%LIBGTOP_BINDIR\%#$(LIBGTOP_BINDIR)#g' \
+	  -e 's#\%LIBGTOP_SERVER\%#$(LIBGTOP_SERVER)#g' \
+	  -e 's#\%LIBGTOP_MAJOR_VERSION\%#$(LIBGTOP_MAJOR_VERSION)#g' \
+	  -e 's#\%LIBGTOP_MINOR_VERSION\%#$(LIBGTOP_MINOR_VERSION)#g' \
+	  -e 's#\%LIBGTOP_MICRO_VERSION\%#$(LIBGTOP_MICRO_VERSION)#g' \
+	  -e 's#\%LIBGTOP_VERSION\%#$(LIBGTOP_VERSION)#g' \
+	  -e 's#\%LIBGTOP_VERSION_CODE\%#$(LIBGTOP_VERSION_CODE)#g' \
+	  -e 's#\%LIBGTOP_SERVER_VERSION\%#$(LIBGTOP_SERVER_VERSION)#g' \
+	  -e 's#\%libgtop_sysdeps_dir\%#$(libgtop_sysdeps_dir)#g' \
+	  -e 's#\%libgtop_need_server\%#$(libgtop_need_server)#g' \
+	  -e 's#\%libgtop_use_machine_h\%#$(libgtop_use_machine_h)#g' \
+	  -e 's#\%libgtop_want_examples\%#$(libgtop_want_examples)#g' \
+	      < $(srcdir)/auto-macros.texi.in > auto-macros.tmp
+	echo '@c Set this if this is LibGTop 1.1.x' >> auto-macros.tmp
+	if [ $(LIBGTOP_VERSION_CODE) -ge 1001000 ] ; then \
+	  echo '@set LIBGTOP-1-1' >> auto-macros.tmp ; \
+	else \
+	  echo '@clear LIBGTOP-1-1' >> auto-macros.tmp ; \
+	fi
+	mv auto-macros.tmp auto-macros.texi

doc/auto-macros.texi.in

@@ -0,0 +1,12 @@
+@c LibGTop major, minor and micro version.
+@set LIBGTOP_MAJOR_VERSION %LIBGTOP_MAJOR_VERSION%
+@set LIBGTOP_MINOR_VERSION %LIBGTOP_MINOR_VERSION%
+@set LIBGTOP_MICRO_VERSION %LIBGTOP_MICRO_VERSION%
+
+@c LibGTop version and numerical version code ("1.234.567" -> 1234567).
+@set LIBGTOP_VERSION "%LIBGTOP_VERSION%"
+@set LIBGTOP_VERSION_CODE %LIBGTOP_VERSION_CODE%
+
+@c LibGTop server version, increased each time the protocol changes.
+@set LIBGTOP_SERVER_VERSION %LIBGTOP_SERVER_VERSION%
+

doc/libgtop2.texi

@@ -5,6 +5,7 @@
 @setchapternewpage odd
 @c %**end of header
 
+@include auto-macros.texi
 @include version.texi
 
 @ifinfo

doc/reference.texi

@@ -493,7 +493,7 @@ glibtop_get_proc_state_l (glibtop *server, glibtop_proc_state *buf,
 @end cartouche
 @end example
 
-Declaration of @code{glibtop_proc_state} in @file{<glibtop/proc_state.h>}:
+Declaration of @code{glibtop_proc_state} in @file{<glibtop/procstate.h>}:
 
 @example
 @cartouche

examples/.cvsignore

@@ -18,7 +18,6 @@ pprint
 pprint_static
 procargs
 procargs_static
-proclist
 df
 df_static
 netlist

examples/ChangeLog

@@ -1,19 +1,3 @@
-2005-12-15  Benoît Dejean  <benoit@placenet.org>
-
-	* proclist.c: (print_pids), (main):
-	
-	Improved example.
-
-2005-12-12  Benoît Dejean  <benoit@placenet.org>
-
-	* .cvsignore:
-	* Makefile.am:
-	* proclist.c: (main):
-	* procmap.c: (main):
-
-	Added quick example for glibtop_get_proclist()
-	and updated procmap example to display smap.
-
 2005-08-02  Benoît Dejean  <TazForEver@dlfp.org>
 
 	* pprint.c: (pprint_get_cpu), (pprint_get_loadavg),

examples/Makefile.am

@@ -8,7 +8,7 @@ DEFS			= @DEFS@
 
 noinst_PROGRAMS	= 	first second pprint procargs df netlist \
 			  mountlist procmap netload sysdeps timings \
-			  openfiles smp proclist
+			  openfiles smp
 
 first_SOURCES		= first.c
 first_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
@@ -48,6 +48,3 @@ netlist_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
 
 openfiles_SOURCES	= openfiles.c
 openfiles_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
-
-proclist_SOURCES	= proclist.c
-proclist_LDADD		= $(top_builddir)/lib/libgtop-2.0.la

examples/df.c

@@ -1,6 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
 #include <glibtop.h>
 
 #include <glibtop/fsusage.h>

examples/first.c

@@ -21,10 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <locale.h>
 #include <libintl.h>
 #include <stdio.h>

examples/mountlist.c

@@ -21,10 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <locale.h>
 #include <libintl.h>
 #include <stdio.h>

examples/netlist.c

@@ -18,10 +18,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <stdio.h>
 
 #include <glibtop.h>

examples/netload.c

@@ -21,10 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <locale.h>
 #include <libintl.h>
 #include <stdio.h>

examples/openfiles.c

@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <glibtop.h>
 #include <glibtop/procopenfiles.h>
 

examples/pprint.c

@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <glibtop.h>
 
 #include <glibtop/union.h>

examples/procargs.c

@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <glibtop.h>
 #include <glibtop/procargs.h>
 

examples/proclist.c

@@ -1,43 +0,0 @@
-#include <glibtop.h>
-#include <glibtop/proclist.h>
-
-#include <glib.h>
-
-#include <stdio.h>
-
-#include <unistd.h>
-#include <sys/types.h>
-
-
-static void print_pids(guint64 which, guint64 arg)
-{
-	unsigned *pids;
-	unsigned i;
-	glibtop_proclist buf;
-
-	pids = glibtop_get_proclist(&buf, which, arg);
-
-	printf("glibtop_get_proclist(%#llx, %llu) -> %lu processes\n",
-	       which, arg, (unsigned long)buf.number);
-
-	for (i = 0; i < buf.number; ++i)
-		printf("%u ", pids[i]);
-
-	putchar('\n');
-	putchar('\n');
-
-	g_free(pids);
-}
-
-
-int main()
-{
-	glibtop_init();
-
-	print_pids(GLIBTOP_KERN_PROC_ALL, 0);
-	print_pids(GLIBTOP_KERN_PROC_UID, getuid());
-
-	glibtop_close();
-
-	return 0;
-}

examples/procmap.c

@@ -21,10 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <locale.h>
 #include <libintl.h>
 #include <stdio.h>
@@ -157,18 +153,6 @@ main (int argc, char *argv [])
 				 perm);
 		}
 
-
-		g_print("smaps flags:%#llx size:%llu rss:%llu "
-			"shared_clean:%llu shared_dirty:%llu "
-			"private_clean:%llu private_dirty: %llu\n",
-			maps[i].flags,
-			maps[i].size >> 10,
-			maps[i].rss >> 10,
-			maps[i].shared_clean >> 10,
-			maps[i].shared_dirty >> 10,
-			maps[i].private_clean >> 10,
-			maps[i].private_dirty >> 10);
-
 		if (filename && (filename != maps [i].filename))
 			g_free ((void*)filename);
 	}

examples/second.c

@@ -21,10 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <locale.h>
 #include <math.h>
 #include <stdio.h>

examples/sysdeps.c

@@ -21,10 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <locale.h>
 #include <libintl.h>
 #include <stdio.h>

examples/timings.c

@@ -21,10 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <locale.h>
 #include <stdio.h>
 #include <libintl.h>

glibtop.h

@@ -77,7 +77,6 @@ struct _glibtop
 	int output [2];			/* Pipe client -> server */
 	int socket;			/* Accepted connection of a socket */
 	int ncpu;			/* Number of CPUs, zero if single-processor */
-	int real_ncpu;			/* Real number of CPUs. Only ncpu are monitored */
 	unsigned long os_version_code;	/* Version code of the operating system */
 	const char *name;		/* Program name for error messages */
 	const char *server_command;	/* Command used to invoke server */

include/glibtop/cpu.h

@@ -52,11 +52,8 @@ G_BEGIN_DECLS
 
 #define GLIBTOP_MAX_CPU		18
 
-/* Nobody should really be using more than 4 processors.
+/* Nobody should really be using more than 4 processors. */
-   Yes we are :)
+#define GLIBTOP_NCPU		4
-   Nobody should really be using more than 32 processors.
-*/
-#define GLIBTOP_NCPU		32
 
 typedef struct _glibtop_cpu	glibtop_cpu;
 

include/glibtop/global.h

@@ -26,6 +26,10 @@
 
 #include <glib.h>
 
+#ifdef _IN_LIBGTOP
+#include <config.h>
+#endif
+
 #ifdef _IN_LIBGTOP
 
 #endif /* _IN_LIBGTOP */

include/glibtop/procmap.h

@@ -43,15 +43,7 @@ G_BEGIN_DECLS
 #define GLIBTOP_MAP_ENTRY_DEVICE	5
 #define GLIBTOP_MAP_ENTRY_FILENAME	6
 
-/* Smap support */
+#define GLIBTOP_MAX_MAP_ENTRY		7
-#define GLIBTOP_MAP_ENTRY_SIZE			 7
-#define GLIBTOP_MAP_ENTRY_RSS			 8
-#define GLIBTOP_MAP_ENTRY_SHARED_CLEAN		 9
-#define GLIBTOP_MAP_ENTRY_SHARED_DIRTY		10
-#define GLIBTOP_MAP_ENTRY_PRIVATE_CLEAN		11
-#define GLIBTOP_MAP_ENTRY_PRIVATE_DIRTY		12
-
-#define GLIBTOP_MAX_MAP_ENTRY		13
 
 #define GLIBTOP_MAP_FILENAME_LEN	215
 
@@ -68,10 +60,6 @@ typedef struct _glibtop_proc_map	glibtop_proc_map;
 struct _glibtop_map_entry
 {
 	guint64 flags, start, end, offset, perm, inode, device;
-	guint64 size,
-		rss,
-		shared_clean, shared_dirty,
-		private_clean, private_dirty;
 	char filename [GLIBTOP_MAP_FILENAME_LEN+1];
 };
 

lib/close.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/error.h>

lib/command.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop/read.h>
 #include <glibtop/write.h>
 #include <glibtop/read_data.h>

lib/glibtop-server.c

@@ -23,7 +23,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop-server-private.h>
 

lib/init.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/sysdeps.h>

lib/inodedb.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/inodedb.h>

lib/open.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/read.h>

lib/parameter.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/parameter.h>
 #include <glibtop/error.h>

lib/sysdeps.c

@@ -19,7 +19,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/union.h>
 #include <glibtop/sysdeps.h>

libgtop-sysdeps.m4

@@ -54,7 +54,7 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	fi
 
 	if test $libgtop_smp = yes ; then
-	  AC_DEFINE(HAVE_LIBGTOP_SMP, 1, [Define if libgtop supports SMP])
+	  AC_DEFINE(HAVE_LIBGTOP_SMP)
 	fi
 
 	AM_CONDITIONAL(LIBGTOP_SMP, test $libgtop_smp = yes)
@@ -152,7 +152,7 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 ], have_i4b=yes, have_i4b=no)
 	  AC_MSG_RESULT($have_i4b)
 	  if test x$have_i4b = xyes; then
-	    AC_DEFINE(HAVE_I4B, 1, [Define if I4B is available])
+	    AC_DEFINE(HAVE_I4B)
 	    AC_MSG_CHECKING([for I4B accounting])
 	    AC_TRY_COMPILE([
 #include <sys/types.h>
@@ -180,8 +180,7 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 ], have_i4b_acct=yes, have_i4b_acct=no)
 	    AC_MSG_RESULT($have_i4b_acct)
 	    if test x$have_i4b_acct = xyes ; then
-	      AC_DEFINE(HAVE_I4B_ACCT, 1,
+	      AC_DEFINE(HAVE_I4B_ACCT)
-                        [Define if I4B accounting is supported])
 	    else
 	      AC_WARN([
 *** I4B accounting disabled - you won't get any PPP statistics.
@@ -212,8 +211,7 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	  fi
 
 	  AC_MSG_CHECKING(for Linux kernel version code)
-	  AC_DEFINE_UNQUOTED(GLIBTOP_LINUX_VERSION_CODE, $os_version_code,
+	  AC_DEFINE_UNQUOTED(GLIBTOP_LINUX_VERSION_CODE, $os_version_code)
-              [Same as LINUX_VERSION_CODE either from <linux/version.h> or from the running kernel (if there are no configured kernel sources).])
 	  AC_MSG_RESULT($os_version_code)
 	  ;;
 	solaris*)
@@ -225,8 +223,7 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	  os_version_code=`echo "$os_version_expr" | dc`
 
 	  AC_MSG_CHECKING(for Solaris release code)
-	  AC_DEFINE_UNQUOTED(GLIBTOP_SOLARIS_RELEASE, $os_version_code,
+	  AC_DEFINE_UNQUOTED(GLIBTOP_SOLARIS_RELEASE, $os_version_code)
-              [Solaris release code (eg. 251 for Solaris 2.5.1).])
 	  AC_MSG_RESULT($os_version_code)
 	  ;;
 	esac
@@ -238,12 +235,11 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	AC_MSG_RESULT($libgtop_need_server)
 
 	if test x$libgtop_need_server = xyes ; then
-	  AC_DEFINE(NEED_LIBGTOP, 1, [Define if libgtop is required])
+	  AC_DEFINE(NEED_LIBGTOP)
 	fi
 
 	if test x$libgtop_use_machine_h = xyes ; then
-	  AC_DEFINE(HAVE_GLIBTOP_MACHINE_H, 1,
+	  AC_DEFINE(HAVE_GLIBTOP_MACHINE_H)
-                    [Define if machine.h in libgtop sysdeps dir])
 	fi
 
 	AM_CONDITIONAL(NEED_LIBGTOP, test x$libgtop_need_server = xyes)

po/ChangeLog

@@ -1,3 +1,19 @@
+2006-04-02  Pema Geyleg  <pema.geyleg@gmail.com
+
+	* dz.po: Added Dzongkha translation by Pema Geyleg
+
+2006-03-30  Guntupalli Karunakar  <karunakar@indlinux.org>
+
+        * dz.po: Added Dzongkha translation.
+
+2006-03-22  Gora Mohanty  <gmohanty@cvs.gnome.org>
+
+        * or.po: Updated Oriya translation.
+
+2006-01-09  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated by Ivar Smolin.
+
 2005-12-04  Theppitak Karoonboonyanan  <thep@linux.thai.net>
 
 	* th.po: Added Thai translation.

po/dz.po

@@ -0,0 +1,242 @@
+# translation of libgtop.HEAD.po to
+# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: libgtop.HEAD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-03-06 05:23+0100\n"
+"PO-Revision-Date: 2006-03-28 11:12-0500\n"
+"Last-Translator: \n"
+"Language-Team:  <pgeyleg@dit.gov.bt>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"X-Poedit-Language: Dzongkha\n"
+"X-Poedit-Country: BHUTAN\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Generator: KBabel 1.10.2\n"
+
+#: ../lib/read.c:65
+#, c-format
+msgid "read %d byte"
+msgid_plural "read %d bytes"
+msgstr[0] "བའིཊི་ %d ལྷག"
+msgstr[1] "བའིཊི་ %d ལྷག"
+
+#: ../lib/read_data.c:53
+msgid "read data size"
+msgstr "གནད་སྡུད་ཀྱི་ཚད་ལྷག"
+
+#: ../lib/read_data.c:72
+#, c-format
+msgid "read %lu byte of data"
+msgid_plural "read %lu bytes of data"
+msgstr[0] "གནས་སྡུད་ བའིཊི་ %lu ལྷག"
+msgstr[1] "གནས་སྡུད་ བའིཊི་ %lu ལྷག"
+
+#: ../lib/write.c:52
+#, c-format
+msgid "wrote %d byte"
+msgid_plural "wrote %d bytes"
+msgstr[0] "བའིཊི་ %d བྲིས་ཡི། "
+msgstr[1] "བའིཊི་ %d བྲིས་ཡི།"
+
+#: ../src/daemon/gnuserv.c:460
+msgid "Enable debugging"
+msgstr "རྐྱེན་སེལ་འབད་ནི་ ལྕོགས་ཅན་བཟོ།"
+
+#: ../src/daemon/gnuserv.c:460
+msgid "DEBUG"
+msgstr "རྐྱེན་སེལ།"
+
+#: ../src/daemon/gnuserv.c:462
+msgid "Enable verbose output"
+msgstr "ཚིག་མང་ཨའུཊི་པུཊི་ ལྕོགས་ཅན་བཟོ།"
+
+#: ../src/daemon/gnuserv.c:462
+msgid "VERBOSE"
+msgstr "ཚིག་མང་།"
+
+#: ../src/daemon/gnuserv.c:464
+msgid "Don't fork into background"
+msgstr "རྒྱབ་གཞིའི་ནང་ ཁ་མ་སྤེལ།"
+
+#: ../src/daemon/gnuserv.c:464
+msgid "NO-DAEMON"
+msgstr "ཌེ་མཱོན་མིན་འདུག"
+
+#: ../src/daemon/gnuserv.c:466
+msgid "Invoked from inetd"
+msgstr "ཨའི་ཨེན་ཨི་ཊི་ཌི་ནང་ལས་ ལས་བཀོལ་འབད།"
+
+#: ../src/daemon/gnuserv.c:466
+msgid "INETD"
+msgstr "ཨའི་ཨེན་ཨི་ཊི་ཌི།"
+
+#: ../src/daemon/gnuserv.c:500
+#, c-format
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"གདམ་ཁ་%s: %sལུ་འཛོལ་བ། \n"
+"འཐོབ་ཚུགས་པའི་ བརྡ་ལམ་གདམ་ཁའི་ ཐོ་ཡིག་ཧྲིལ་བུ་ཅིག་ལུ་ བལྟ་ནིའི་དོན་ལས་ '%s --help' གཡོག་བཀོལ།\n"
+
+#: ../sysdeps/osf1/siglist.c:28
+#: ../sysdeps/sun4/siglist.c:28
+msgid "Hangup"
+msgstr "ཐོགས་རྐྱེན།"
+
+#: ../sysdeps/osf1/siglist.c:29
+#: ../sysdeps/sun4/siglist.c:29
+msgid "Interrupt"
+msgstr "བར་ཆད།"
+
+#: ../sysdeps/osf1/siglist.c:30
+#: ../sysdeps/sun4/siglist.c:30
+msgid "Quit"
+msgstr "སྤངས།"
+
+#: ../sysdeps/osf1/siglist.c:31
+#: ../sysdeps/sun4/siglist.c:31
+msgid "Illegal instruction"
+msgstr "ཁྲིམས་འགལ་བཀོད་རྒྱ།"
+
+#: ../sysdeps/osf1/siglist.c:32
+#: ../sysdeps/sun4/siglist.c:32
+msgid "Trace trap"
+msgstr "ཧིང་ རྗེས་འཚོལ་འབད།"
+
+#: ../sysdeps/osf1/siglist.c:33
+#: ../sysdeps/sun4/siglist.c:33
+msgid "Abort"
+msgstr "བར་བཤོལ་འབད།"
+
+#: ../sysdeps/osf1/siglist.c:34
+#: ../sysdeps/sun4/siglist.c:34
+msgid "EMT error"
+msgstr "ཨི་ཨེམ་ཊི་འཛོལ་བ།"
+
+#: ../sysdeps/osf1/siglist.c:35
+#: ../sysdeps/sun4/siglist.c:35
+msgid "Floating-point exception"
+msgstr "ལྡིང་ཚད་དམིགས་བསལ།"
+
+#: ../sysdeps/osf1/siglist.c:36
+#: ../sysdeps/sun4/siglist.c:36
+msgid "Kill"
+msgstr "གསད།"
+
+#: ../sysdeps/osf1/siglist.c:37
+#: ../sysdeps/sun4/siglist.c:37
+msgid "Bus error"
+msgstr "བརྡ་རྟགས་འགྲུལ་ལམ་གྱི་འཛོལ་བ།"
+
+#: ../sysdeps/osf1/siglist.c:38
+#: ../sysdeps/sun4/siglist.c:38
+msgid "Segmentation violation"
+msgstr "ཆ་བགོ་བའི་འགལ་བ།"
+
+#: ../sysdeps/osf1/siglist.c:39
+#: ../sysdeps/sun4/siglist.c:39
+msgid "Bad argument to system call"
+msgstr "རིམ་ལུགས་བོད་བརྡ་ལུ་ སྒྲུབ་རྟགས་བྱང་ཉེས།"
+
+#: ../sysdeps/osf1/siglist.c:40
+#: ../sysdeps/sun4/siglist.c:40
+msgid "Broken pipe"
+msgstr "རྒྱུད་དུང་ཆད་པ།"
+
+#: ../sysdeps/osf1/siglist.c:41
+#: ../sysdeps/sun4/siglist.c:41
+msgid "Alarm clock"
+msgstr "འཇིགས་བརྡ་ཆེ་འཁོར།"
+
+#: ../sysdeps/osf1/siglist.c:42
+#: ../sysdeps/sun4/siglist.c:42
+msgid "Termination"
+msgstr "རྩ་གྲོལ།"
+
+#: ../sysdeps/osf1/siglist.c:43
+#: ../sysdeps/sun4/siglist.c:43
+msgid "Urgent condition on socket"
+msgstr "སོཀ་ཀེཊི་ལུ་ འཕྲལ་མཁོའི་གནས་སྟངས།"
+
+#: ../sysdeps/osf1/siglist.c:44
+#: ../sysdeps/sun4/siglist.c:44
+msgid "Stop"
+msgstr "བཀག"
+
+#: ../sysdeps/osf1/siglist.c:45
+#: ../sysdeps/sun4/siglist.c:45
+msgid "Keyboard stop"
+msgstr "ལྡེ་སྒྲོམ་བཀག"
+
+#: ../sysdeps/osf1/siglist.c:46
+#: ../sysdeps/sun4/siglist.c:46
+msgid "Continue"
+msgstr "འཕྲོ་མཐུད།"
+
+#: ../sysdeps/osf1/siglist.c:47
+#: ../sysdeps/sun4/siglist.c:47
+msgid "Child status has changed"
+msgstr "རྩ་ལག་གི་གནས་ཚད་ བསྒྱུར་བཅོས་ཡར་སོ་ནུག"
+
+#: ../sysdeps/osf1/siglist.c:48
+#: ../sysdeps/sun4/siglist.c:48
+msgid "Background read from tty"
+msgstr "ཊི་ཊི་ཝའི་ནང་ལས་ རྒྱབ་གཞི་ལྷག་ཡོད།"
+
+#: ../sysdeps/osf1/siglist.c:49
+#: ../sysdeps/sun4/siglist.c:49
+msgid "Background write to tty"
+msgstr "ཊི་ཊི་ཝའི་ལུ་ རྒྱབ་གཞི་བྲིས།"
+
+#: ../sysdeps/osf1/siglist.c:50
+#: ../sysdeps/sun4/siglist.c:50
+msgid "I/O now possible"
+msgstr "ཨའི་/ཨོ་ ད་ལྟོ་ཚུགས་པས།"
+
+#: ../sysdeps/osf1/siglist.c:51
+#: ../sysdeps/sun4/siglist.c:51
+msgid "CPU limit exceeded"
+msgstr "ལས་སྦྱོར་ལྟེ་བའི་ཚད་ལས་ ལྷག་སོ་ནུག"
+
+#: ../sysdeps/osf1/siglist.c:52
+#: ../sysdeps/sun4/siglist.c:52
+msgid "File size limit exceeded"
+msgstr "ཡིག་སྣོད་ཀྱི་ཚད་ལས་ ལྷག་སོ་ནུག"
+
+#: ../sysdeps/osf1/siglist.c:53
+#: ../sysdeps/sun4/siglist.c:53
+msgid "Virtual alarm clock"
+msgstr "བར་ཅུ་ཡེལ་ འཇིགས་བརྡའི་ཆེ་འཁོར།"
+
+#: ../sysdeps/osf1/siglist.c:54
+#: ../sysdeps/sun4/siglist.c:54
+msgid "Profiling alarm clock"
+msgstr "གསལ་སྡུད་འཇིགས་བརྡའི་ཆེ་འཁོར།"
+
+#: ../sysdeps/osf1/siglist.c:55
+#: ../sysdeps/sun4/siglist.c:55
+msgid "Window size change"
+msgstr "སྒོ་སྒྲིག་ཚད་ཀྱི་བསྒྱུར་བཅོས།"
+
+#: ../sysdeps/osf1/siglist.c:56
+#: ../sysdeps/sun4/siglist.c:56
+msgid "Information request"
+msgstr "བརྡ་དོན་གྱི་ཞུ་བ།"
+
+#: ../sysdeps/osf1/siglist.c:57
+#: ../sysdeps/sun4/siglist.c:57
+msgid "User defined signal 1"
+msgstr "ལག་ལེན་པའི་ ངེས་འཛིན་བརྡ་རྟགས་ ༡པ།"
+
+#: ../sysdeps/osf1/siglist.c:58
+#: ../sysdeps/sun4/siglist.c:58
+msgid "User defined signal 2"
+msgstr "ལག་ལེན་པའི་ངེས་འཛིན་བརྡ་རྟགས་ ༢པ།"
+

po/et.po

@@ -9,7 +9,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop HEAD\n"
+"Project-Id-Version: libgtop 2.12\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-02-08 15:28+0100\n"
 "PO-Revision-Date: 2005-03-09 10:47+0200\n"

po/or.po

@@ -1,80 +1,82 @@
 # Oriya translation of metacity.HEAD.pot.
-# Copyright (C) 2004, Free Software Foundation, Inc.
+# Copyright (C) 2004, 2006, Free Software Foundation, Inc.
 # This file is distributed under the same license as the libgtop package.
-# Sony Mohanty <sonalika_04@sify.com>, 2004. 
+# Sony Mohanty <sonalika_04@sify.com>, 2004.
+# Jeeban <srujanik@sancharnet.in>, 2004.
+# Gora Mohanty <gora_mohanty@yahoo.co.in>, 2006.
 # $Id$
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop.HEAD.or\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-25 18:15+0200\n"
+"POT-Creation-Date: 2006-03-22 00:18+0530\n"
-"PO-Revision-Date: 2004-09-09 12:19+0530\n"
+"PO-Revision-Date: 2006-03-22 00:13+0530\n"
-"Last-Translator: Jeeban <srujanik@sancharnet.in>\n"
+"Last-Translator: Gora Mohanty <gora_mohanty@yahoo.co.in>\n"
 "Language-Team: Oriya <oriya-group@lists.sarovar.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/read.c:65
+#: ../lib/read.c:65
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
 msgstr[0] "%d ବାଇଟ ପଢ଼ନ୍ତୁ"
 msgstr[1] "%d ବାଇଟଗୁଡ଼ିକ ପଢ଼ନ୍ତୁ"
 
-#: lib/read_data.c:53
+#: ../lib/read_data.c:53
 msgid "read data size"
 msgstr "ତଥ୍ଯ ଆକାର ପଢ଼ନ୍ତୁ"
 
-#: lib/read_data.c:72
+#: ../lib/read_data.c:72
-#, fuzzy, c-format
+#, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
-msgstr[0] "%d ବାଇଟ ପଢ଼ନ୍ତୁ"
+msgstr[0] "%lu ବାଇଟ ପଢ଼ନ୍ତୁ"
-msgstr[1] "%d ବାଇଟଗୁଡ଼ିକ ପଢ଼ନ୍ତୁ"
+msgstr[1] "%lu ବାଇଟଗୁଡ଼ିକ ପଢ଼ନ୍ତୁ"
 
-#: lib/write.c:52
+#: ../lib/write.c:52
-#, fuzzy, c-format
+#, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
-msgstr[0] "%d ବାଇଟ ଲେଖନ୍ତୁ"
+msgstr[0] "%d ବାଇଟ ଲେଖଗଲା"
-msgstr[1] "%d ବାଇଟଗୁଡ଼ିକ ଲେଖନ୍ତୁ"
+msgstr[1] "%d ବାଇଟଗୁଡ଼ିକ ଲେଖାଗଲା"
 
-#: src/daemon/gnuserv.c:460
+#: ../src/daemon/gnuserv.c:460
 msgid "Enable debugging"
 msgstr "ତ୍ରୁଟିମୁକ୍ତ କରିବା ପାଇଁ ସମର୍ଥ"
 
-#: src/daemon/gnuserv.c:460
+#: ../src/daemon/gnuserv.c:460
 msgid "DEBUG"
 msgstr "ତୃଟିମୁକ୍ତ"
 
-#: src/daemon/gnuserv.c:462
+#: ../src/daemon/gnuserv.c:462
 msgid "Enable verbose output"
 msgstr "ଦୃଷ୍ଟ ସୂଚନାଯୁକ୍ତ ନିର୍ଗମ କରିବା ପାଇଁ ସକ୍ଷମ"
 
-#: src/daemon/gnuserv.c:462
+#: ../src/daemon/gnuserv.c:462
 msgid "VERBOSE"
 msgstr "ଦୃଷ୍ଟ ସୂଚନାଯୁକ୍ତ"
 
-#: src/daemon/gnuserv.c:464
+#: ../src/daemon/gnuserv.c:464
 msgid "Don't fork into background"
 msgstr "ପୃଷ୍ଠଭୂମିକୁ ଶାଖାଯୁକ୍ତ କରନ୍ତୁ ନାହିଁ"
 
-#: src/daemon/gnuserv.c:464
+#: ../src/daemon/gnuserv.c:464
 msgid "NO-DAEMON"
 msgstr "କାର୍ଯ୍ଯ ସହାୟକ ନାହିଁ"
 
-#: src/daemon/gnuserv.c:466
+#: ../src/daemon/gnuserv.c:466
 msgid "Invoked from inetd"
 msgstr "ଆଇନେଟଡିରୁ ଡକାଯାଇଛି"
 
-#: src/daemon/gnuserv.c:466
+#: ../src/daemon/gnuserv.c:466
 msgid "INETD"
 msgstr "ଆଇନେଟଡି"
 
-#: src/daemon/gnuserv.c:500
+#: ../src/daemon/gnuserv.c:500
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -83,126 +85,126 @@ msgstr ""
 "%s ପସନ୍ଦରେ ତୃଟି: %s.\n"
 "ଉପଲବ୍ଧ ପୂରା ପାଠ୍ଯ ନିର୍ଦ୍ଦେଶ ପସନ୍ଦର ତାଲିକା ଦେଖିବା ପାଇଁ '%s --help' ଚଳାନ୍ତୁ.\n"
 
-#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
+#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28
 msgid "Hangup"
 msgstr "ସଂଯୋଗ ଛିନ୍ନ କରନ୍ତୁ"
 
-#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
+#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
 msgid "Interrupt"
 msgstr "ବ୍ଯାହତ କରନ୍ତୁ"
 
-#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
+#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
 msgid "Quit"
 msgstr "ବିଦାୟ ନିଅନ୍ତୁ"
 
-#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
+#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
 msgid "Illegal instruction"
 msgstr "ଅବୈଧ ଅନୁଦେଶ"
 
-#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
+#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
 msgid "Trace trap"
 msgstr "ଅନୁସନ୍ଧାନ ଯନ୍ତା"
 
-#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
+#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
 msgid "Abort"
 msgstr "ପରିତ୍ଯାଗ"
 
-#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
+#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
 msgid "EMT error"
 msgstr "ଇ.ଏମ.ଟି. ତ୍ରୁଟି"
 
-#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
+#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
 msgid "Floating-point exception"
 msgstr "ଅସ୍ଥାୟୀ ବିନ୍ଦୁ ତ୍ରୁଟି"
 
-#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
+#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
 msgid "Kill"
 msgstr "ସମାପନ"
 
-#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
+#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
 msgid "Bus error"
 msgstr "ପରିପଥ ତ୍ରୁଟି"
 
-#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
+#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
 msgid "Segmentation violation"
 msgstr "ଖଣ୍ଡକରଣ ଉଲଂଘନ"
 
-#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
+#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
 msgid "Bad argument to system call"
 msgstr "ତନ୍ତ୍ର ଡାକରାକୁ ଅବୈଧ ସ୍ବତନ୍ତ୍ରଚର"
 
-#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
+#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
 msgid "Broken pipe"
 msgstr "ଭଙ୍ଗା ପାଇପ"
 
-#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
+#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
 msgid "Alarm clock"
 msgstr "ସତର୍କ ଘଡ଼ି"
 
-#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
+#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
 msgid "Termination"
 msgstr "ସମାପ୍ତି"
 
-#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
+#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
 msgid "Urgent condition on socket"
 msgstr "ସକେଟରେ ଅତ୍ଯାଶ୍ଯକ ଅବସ୍ଥା"
 
-#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
+#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
 msgid "Stop"
 msgstr "ବନ୍ଦ"
 
-#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
+#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
 msgid "Keyboard stop"
 msgstr "ଚାବିପଟି ବନ୍ଦ"
 
-#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
+#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
 msgid "Continue"
 msgstr "ଚାଲୁ ରଖନ୍ତୁ"
 
-#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
+#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
 msgid "Child status has changed"
 msgstr "ନିର୍ଭରକ ଅବସ୍ଥିତି ବଦଳି ଯାଇଛି"
 
-#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
+#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
 msgid "Background read from tty"
 msgstr "ଟି.ଟି.ୱାଇ.ଠାରୁ ପୃଷ୍ଠଭୂମି ପଠନ"
 
-#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
+#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
 msgid "Background write to tty"
 msgstr "ଟି.ଟି.ୱାଇ.କୁ ପୃଷ୍ଠଭୂମି ଲିଖନ"
 
-#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
+#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
 msgid "I/O now possible"
 msgstr "ବର୍ତ୍ତମାନ ନିବେଶ/ନିର୍ଗମ ସମ୍ଭବ"
 
-#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
+#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
 msgid "CPU limit exceeded"
 msgstr "କେନ୍ଦ୍ରୀୟ ସଂସାଧକ ସୀମା ପାର ହୋଇଯାଇଛି"
 
-#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
+#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
 msgid "File size limit exceeded"
 msgstr "ଫାଇଲ ଆକାର ସୀମା ପାର ହୋଇଯାଇଛି"
 
-#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
+#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
 msgid "Virtual alarm clock"
 msgstr "ଆଭାସୀ ସତର୍କ ଘଡ଼ି"
 
-#: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
+#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
 msgid "Profiling alarm clock"
 msgstr "ସତର୍କ ଘଡ଼ିର ରୂପରେଖ ପ୍ରସ୍ତୁତି"
 
-#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
+#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
 msgid "Window size change"
 msgstr "ୱିଣ୍ଡୋ ଆକାର ବଦଳା"
 
-#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
+#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
 msgid "Information request"
 msgstr "ସୂଚନା ଅନୁରୋଧ"
 
-#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
+#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
 msgid "User defined signal 1"
 msgstr "ଚାଳକ ନିର୍ଦ୍ଦିଷ୍ଟ ସଙ୍କେତ ୧"
 
-#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
+#: ../sysdeps/osf1/siglist.c:58 ../sysdeps/sun4/siglist.c:58
 msgid "User defined signal 2"
 msgstr "ଚାଳକ ନିର୍ଦ୍ଦିଷ୍ଟ ସଙ୍କେତ ୨"

src/daemon/io.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include "daemon.h"
 #include <glibtop/error.h>
 

src/daemon/main.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include "daemon.h"
 
 #ifdef LIBGTOP_ENABLE_DEBUG

src/daemon/server.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include "daemon.h"
 
 static glibtop _glibtop_global_server;

src/daemon/slave.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include "daemon.h"
 #include <glibtop/error.h>
 

src/daemon/version.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/version.h>

src/inodedb/file_by_inode2.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/inodedb.h>

src/inodedb/mkinodedb2.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/inodedb.h>

sysdeps/aix/close.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop/close.h>
 
 /* Closes pipe to gtop server. */

sysdeps/aix/cpu.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <stdlib.h>
 #include <sys/systemcfg.h>
 #include <sys/sysinfo.h>

sysdeps/aix/loadavg.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <nlist.h>
 #include <glibtop.h>
 #include <glibtop/loadavg.h>

sysdeps/aix/mem.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <unistd.h>
 #include <sys/vminfo.h>
 

sysdeps/aix/msg_limits.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <sys/msg.h>
 
 #include <glibtop.h>

sysdeps/aix/netlist.c

@@ -18,7 +18,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/netlist.h>
 

sysdeps/aix/netload.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <sys/socket.h>
 #include <net/if.h>
 #include <netinet/in.h>

sysdeps/aix/nosuid.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <sys/systemcfg.h>
 
 #include <glibtop.h>

sysdeps/aix/open.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <glibtop.h>

sysdeps/aix/ppp.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/ppp.h>

sysdeps/aix/procargs.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <procinfo.h>
 
 #include <glibtop.h>

sysdeps/aix/prockernel.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <procinfo.h>
 #include <sys/proc.h>
 

sysdeps/aix/proclist.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <procinfo.h>
 
 #include <glibtop.h>

sysdeps/aix/procmap.c

@@ -22,7 +22,6 @@
 */
 
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/procmap.h>

sysdeps/aix/procmem.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <unistd.h>
 #include <sys/vminfo.h>
 #include <sys/resource.h>

sysdeps/aix/procsegment.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <unistd.h>
 #include <sys/vminfo.h>
 #include <sys/resource.h>

sysdeps/aix/procsignal.c

@@ -21,7 +21,6 @@
    Boston, MA) +2111-1307, USA.
 */
 
-#include <config.h>
 #include <unistd.h>
 #include <sys/vminfo.h>
 #include <sys/resource.h>

sysdeps/aix/procstate.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <procinfo.h>
 #include <sys/thread.h>
 

sysdeps/aix/proctime.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <unistd.h>
 
 #include <glibtop.h>

sysdeps/aix/procuid.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <unistd.h>
 #include <sys/vminfo.h>
 #include <sys/resource.h>

sysdeps/aix/sem_limits.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/sem_limits.h>
 #include <glibtop/error.h>

sysdeps/aix/shm_limits.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <sys/shm.h>
 
 #include <glibtop.h>

sysdeps/aix/siglist.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/signal.h>
 

sysdeps/aix/swap.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <sys/vminfo.h>
 
 #include <glibtop.h>

sysdeps/aix/uptime.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <sys/times.h>
 
 #include <glibtop.h>

sysdeps/aix/utils.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <nlist.h>
 
 #include <procinfo.h>

sysdeps/common/gnuslib.c

@@ -29,7 +29,6 @@
  * ../etc/gnuserv.README relative to the directory containing this file)
  */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/gnuserv.h>

sysdeps/common/inodedb.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/inodedb.h>

sysdeps/common/procargs.c

@@ -1,4 +1,3 @@
-#include <config.h>
 #include <glibtop/procargs.h>
 
 #include <glib.h>

sysdeps/common/sysdeps_suid.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/union.h>

sysdeps/freebsd/close.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/close.h>
 

sysdeps/freebsd/cpu.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/cpu.h>

sysdeps/freebsd/fsusage.c

@@ -1,4 +1,3 @@
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/fsusage.h>

sysdeps/freebsd/init.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/open.h>
 

sysdeps/freebsd/loadavg.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/loadavg.h>

sysdeps/freebsd/mem.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/mem.h>

sysdeps/freebsd/msg_limits.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/msg_limits.h>

sysdeps/freebsd/netload.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/netload.h>

sysdeps/freebsd/nosuid.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/close.h>

sysdeps/freebsd/open.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/init_hooks.h>

sysdeps/freebsd/ppp.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/ppp.h>

sysdeps/freebsd/procargs.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/procargs.h>

sysdeps/freebsd/prockernel.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/prockernel.h>

sysdeps/freebsd/proclist.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/proclist.h>

sysdeps/freebsd/procmap.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/procmap.h>

sysdeps/freebsd/procmem.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/procmem.h>

sysdeps/freebsd/procopenfiles.c

@@ -24,7 +24,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/procopenfiles.h>

sysdeps/freebsd/procsegment.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/procsegment.h>

sysdeps/freebsd/procsignal.c

@@ -21,7 +21,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/procsignal.h>