oxmc/libgtop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove dependency on libgnome, check for linux/isdn.h for distros using

Browse Source 
2004-03-04  Bastien Nocera  <hadess@hadess.net>

        * configure.in:
        * include/libgtop-i18n.h:
        * lib/lib.pl:
        * lib/read.c:
        * lib/read_data.c:
        * lib/write.c:
        * sysdeps/names/cpu.c:
        * sysdeps/names/fsusage.c:
        * sysdeps/names/loadavg.c:
        * sysdeps/names/mem.c:
        * sysdeps/names/mountlist.c:
        * sysdeps/names/msg_limits.c:
        * sysdeps/names/netload.c:
        * sysdeps/names/ppp.c:
        * sysdeps/names/procargs.c:
        * sysdeps/names/prockernel.c:
        * sysdeps/names/proclist.c:
        * sysdeps/names/procmap.c:
        * sysdeps/names/procmem.c:
        * sysdeps/names/procsegment.c:
        * sysdeps/names/procsignal.c:
        * sysdeps/names/procstate.c:
        * sysdeps/names/proctime.c:
        * sysdeps/names/procuid.c:
        * sysdeps/names/sem_limits.c:
        * sysdeps/names/shm_limits.c:
        * sysdeps/names/swap.c:
        * sysdeps/names/sysdeps.c:
        * sysdeps/names/uptime.c: remove dependency on libgnome,
        check for linux/isdn.h for distros using the 2.6 kernel headers
This commit is contained in:
Bastien Nocera
2004-03-04 15:29:16 +00:00
committed by Bastien Nocera
parent bbea6f3e16
commit 2ae3495a87
39 changed files with 122 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ChangeLog
View File

@@ -1,3 +1,36 @@
2004-03-04 Bastien Nocera <hadess@hadess.net>
* configure.in:
* include/libgtop-i18n.h:
* lib/lib.pl:
* lib/read.c:
* lib/read_data.c:
* lib/write.c:
* sysdeps/names/cpu.c:
* sysdeps/names/fsusage.c:
* sysdeps/names/loadavg.c:
* sysdeps/names/mem.c:
* sysdeps/names/mountlist.c:
* sysdeps/names/msg_limits.c:
* sysdeps/names/netload.c:
* sysdeps/names/ppp.c:
* sysdeps/names/procargs.c:
* sysdeps/names/prockernel.c:
* sysdeps/names/proclist.c:
* sysdeps/names/procmap.c:
* sysdeps/names/procmem.c:
* sysdeps/names/procsegment.c:
* sysdeps/names/procsignal.c:
* sysdeps/names/procstate.c:
* sysdeps/names/proctime.c:
* sysdeps/names/procuid.c:
* sysdeps/names/sem_limits.c:
* sysdeps/names/shm_limits.c:
* sysdeps/names/swap.c:
* sysdeps/names/sysdeps.c:
* sysdeps/names/uptime.c: remove dependency on libgnome,
check for linux/isdn.h for distros using the 2.6 kernel headers
2004-02-07 Kevin Vandersloot
* configure.in: release 2.5.1

31
configure.in
View File

@@ -91,11 +91,6 @@ export cross_compiling
AM_PROG_LIBTOOL
dnl Let the user enable compiler warnings
dnl GNOME_COMPILE_WARNINGS
dnl GNOME_INIT_HOOK(gnome_found=yes)
AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes)
GNOME_LIBGTOP_SYSDEPS
@@ -141,11 +136,17 @@ AC_SUBST(smp_examples)
GLIB_REQUIRED=2.0.0
PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED libgnome-2.0)
PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
dnl (1.2.0,,AC_MSG_ERROR(GLIB >= 1.2.0 is required for LibGTop))
AC_CHECK_HEADER(popt.h,[POPT=yes],[POPT=no])
AC_MSG_CHECKING(for popt.h)
if test x$POPT = xyes ; then
AC_MSG_RESULT(yes)
else
AC_MSG_ERROR([libgtop requires the popt development libraries])
fi
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
@@ -179,6 +180,12 @@ AC_CHECK_FUNCS(dlerror,,)
LIBS="$oLIBS"
AC_SUBST(DL_LIB)
dnl Linux
AC_CHECK_HEADER(linux/isdn.h,[HAVE_ISDN_H=yes],[HAVE_ISDN_H=no])
if test x$HAVE_ISDN_H = xyes ; then
AC_DEFINE(HAVE_ISDN_H, 1, [defined if you have linux/isdn.h])
fi
dnl AIX
AH_TEMPLATE(HAVE_VMGETINFO, [Define to 1 if you have the 'vmgetinfo' function in libperfstat])
AC_CHECK_LIB(perfstat, vmgetinfo, AC_DEFINE(HAVE_VMGETINFO))
@@ -337,6 +344,16 @@ machine_incs="-I\$(top_srcdir)/sysdeps/$sysdeps_dir"
AC_SUBST(machine_incs)
if test "$GCC" = "yes" ; then
CFLAGS="\
-Wall \
-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
-Wnested-externs -Wpointer-arith \
-Wcast-align -Wsign-compare \
-fno-strict-aliasing \
$CFLAGS"
fi
INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -DGLIBTOP_NAMES -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"'\"'
AC_SUBST(INCLUDES)

4
examples/ChangeLog
View File

@@ -1,3 +1,7 @@
2004-03-04 Bastien Nocera <hadess@hadess.net>
* smp.c: use libgtop-i18n.h
2003-10-21 Bastien Nocera <hadess@hadess.net>
* Makefile.am:

2
examples/smp.c
View File

@@ -29,7 +29,7 @@
#include <glibtop.h>
#include <glibtop/cpu.h>
#include <libgnome/gnome-i18n.h>
#include "libgtop-i18n.h"
int
main (int argc, char *argv [])

11
include/libgtop-i18n.h Normal file
View File

@@ -0,0 +1,11 @@
#include <config.h>
#include <libintl.h>
#define _(String) gettext (String)
#ifdef gettext_noop
# define N_(String) gettext_noop (String)
#else
# define N_(String) (String)
#endif

2
lib/lib.pl
View File

@@ -27,7 +27,7 @@ print '#include <glibtop/open.h>';
print '';
print '#include <glibtop/sysdeps.h>';
print '#include <glibtop/union.h>';
print '#include <libgnome/gnome-i18n.h>';
print '#include "libgtop-i18n.h"';
print '';
print '#include <glibtop/command.h>';

2
lib/read.c
View File

@@ -23,7 +23,7 @@
#include <config.h>
#include <glibtop/read.h>
#include <libgnome/gnome-i18n.h>
#include "libgtop-i18n.h"
/* Reads some data from server. */

2
lib/read_data.c
View File

@@ -24,7 +24,7 @@
#include <config.h>
#include <glibtop/read_data.h>
#include <libgnome/gnome-i18n.h>
#include "libgtop-i18n.h"
/* Reads some data from server. */

2
lib/write.c
View File

@@ -24,7 +24,7 @@
#include <config.h>
#include <glibtop/write.h>
#include <libgnome/gnome-i18n.h>
#include "libgtop-i18n.h"
/* Writes some data to server. */

6
src/daemon/ChangeLog
View File

@@ -1,3 +1,9 @@
2004-03-04 Bastien Nocera <hadess@hadess.net>
* Makefile.am:
* gnuserv.c: link explicitely to popt and use libgtop-i18n.h
instead of libgnome
2003-10-20 Bastien Nocera <hadess@hadess.net>
* Makefile.am:

7
src/daemon/Makefile.am
View File

@@ -38,12 +38,13 @@ libgtop_daemon2_LDADD = $(top_builddir)/lib/libgtop-2.0.la \
$(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
$(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
@sysdeps_suid_lib@ \
$(suid_sysdeps) $(suid_common)\
$(LIBGTOP_LIBS)\
$(suid_sysdeps) $(suid_common) \
$(LIBGTOP_LIBS) \
-lpopt \
@libs_xauth@
libgtop_server2_SOURCES = server.c slave.c io.c version.c daemon.h
libgtop_server2_LDADD = $(GLIB_LIBS) $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid-2.0.la \
libgtop_server2_LDADD = $(GLIB_LIBS) -lpopt $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid-2.0.la \
$(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la
EXTRA_DIST = server_config.h.in server_config.pl

2
src/daemon/gnuserv.c
View File

@@ -31,7 +31,7 @@
#include <config.h>
#include <libgnome/gnome-i18n.h>
#include "libgtop-i18n.h"
#include <glibtop.h>
#include <glibtop/open.h>
#include <glibtop/close.h>

5
sysdeps/linux/ChangeLog
View File

@@ -1,3 +1,8 @@
2004-03-04 Bastien Nocera <hadess@hadess.net>
* ppp.c: use a config.h define instead of copying the values in
the file (Closes: #126504)
2004-02-02 Sebastien Bacher <seb128@debian.org>
* sysdeps/linux/mem.c: (glibtop_get_mem_s): patch from

8
sysdeps/linux/ppp.c
View File

@@ -33,12 +33,12 @@
#include <glib.h>
#ifndef ISDN_MAX_CHANNELS
#ifdef HAVE_ISDN_H
#include <linux/isdn.h>
#else
#define ISDN_MAX_CHANNELS 64
#endif
#ifndef IIOCGETCPS
#define IIOCGETCPS _IO('I',21)
#endif
#endif /* HAVE_ISDN_H */
static const unsigned long _glibtop_sysdeps_ppp =
(1L << GLIBTOP_PPP_STATE) + (1L << GLIBTOP_PPP_BYTES_IN) +

2
sysdeps/names/cpu.c
View File

@@ -22,7 +22,7 @@
*/
#include <glibtop/cpu.h>
#include <libgnome/gnome-i18n.h>
#include "libgtop-i18n.h"
const char *glibtop_names_cpu [GLIBTOP_MAX_CPU] =
{

2
sysdeps/names/fsusage.c
View File

@@ -22,7 +22,7 @@
*/
#include <glibtop/fsusage.h>
#include <libgnome/gnome-i18n.h>
#include "libgtop-i18n.h"
const char *glibtop_names_fsusage [GLIBTOP_MAX_FSUSAGE] =
{

2
sysdeps/names/loadavg.c
View File

@@ -22,7 +22,7 @@
*/
#include <glibtop/loadavg.h>
#include <libgnome/gnome-i18n.h>
#include "libgtop-i18n.h"
const char *glibtop_names_loadavg [GLIBTOP_MAX_LOADAVG] =
{

2
sysdeps/names/mem.c
View File

@@ -22,7 +22,7 @@
*/
#include <glibtop/mem.h>
#include <libgnome/gnome-i18n.h>
#include "libgtop-i18n.h"
const char *glibtop_names_mem [GLIBTOP_MAX_MEM] =
{

2
sysdeps/names/mountlist.c
View File

@@ -22,7 +22,7 @@
*/
#include <glibtop/mountlist.h>
#include <libgnome/gnome-i18n.h>
#include "libgtop-i18n.h"
const char *glibtop_names_mountlist [GLIBTOP_MAX_MOUNTLIST] =
{

2
sysdeps/names/msg_limits.c
View File

@@ -22,7 +22,7 @@
*/
#include <glibtop/msg_limits.h>
#include <libgnome/gnome-i18n.h>
#include "libgtop-i18n.h"
const char *glibtop_names_msg_limits [GLIBTOP_MAX_MSG_LIMITS] =
{

2
sysdeps/names/netinfo.c
View File

@@ -24,7 +24,7 @@
*/
#include <glibtop/netinfo.h>
#include <libgnome/gnome-i18n.h>
#include "libgtop-i18n.h"
const char *glibtop_names_netinfo[GLIBTOP_MAX_NETINFO] =
{

2
sysdeps/names/netload.c
View File

@@ -22,7 +22,7 @@
*/
#include <glibtop/netload.h>
#include <libgnome/gnome-i18n.h>
#include "libgtop-i18n.h"
const char *glibtop_names_netload [GLIBTOP_MAX_NETLOAD] =
{

2
sysdeps/names/ppp.c
View File

@@ -22,7 +22,7 @@
*/
#include <glibtop/ppp.h>
#include <libgnome/gnome-i18n.h>
#include "libgtop-i18n.h"
const char *glibtop_names_ppp [GLIBTOP_MAX_PPP] =
{

2
sysdeps/names/procargs.c
View File

@@ -22,7 +22,7 @@
*/
#include <glibtop/procargs.h>
#include <libgnome/gnome-i18n.h>
#include "libgtop-i18n.h"
const char *glibtop_names_proc_args [GLIBTOP_MAX_PROC_ARGS] =
{

2
sysdeps/names/proccwd.c
View File

@@ -25,7 +25,7 @@
#include <glibtop.h>
#include <glibtop/proccwd.h>
#include <libgnome/gnome-i18n.h>
#include "libgtop-i18n.h"
const char *glibtop_names_proc_cwd[GLIBTOP_MAX_PROC_CWD] =
{

2
sysdeps/names/prockernel.c
View File

@@ -23,7 +23,7 @@
#include <glibtop.h>
#include <glibtop/prockernel.h>
#include <libgnome/gnome-i18n.h>
#include "libgtop-i18n.h"
const char *glibtop_names_proc_kernel [GLIBTOP_MAX_PROC_KERNEL] =
{

2
sysdeps/names/proclist.c
View File

@@ -22,7 +22,7 @@
*/
#include <glibtop/proclist.h>
#include <libgnome/gnome-i18n.h>
#include "libgtop-i18n.h"
const char *glibtop_names_proclist [GLIBTOP_MAX_PROCLIST] =
{

2
sysdeps/names/procmap.c
View File

@@ -22,7 +22,7 @@
*/
#include <glibtop/procmap.h>
#include <libgnome/gnome-i18n.h>
#include "libgtop-i18n.h"
const char *glibtop_names_proc_map [GLIBTOP_MAX_PROC_MAP] =
{

2
sysdeps/names/procmem.c
View File

@@ -23,7 +23,7 @@
#include <glibtop.h>
#include <glibtop/procmem.h>
#include <libgnome/gnome-i18n.h>
#include "libgtop-i18n.h"
#define GLIBTOP_PROC_MEM_SIZE 0
#define GLIBTOP_PROC_MEM_VSIZE 1

2
sysdeps/names/procsegment.c
View File

@@ -23,7 +23,7 @@
#include <glibtop.h>
#include <glibtop/procsegment.h>
#include <libgnome/gnome-i18n.h>
#include "libgtop-i18n.h"
const char *glibtop_names_proc_segment [GLIBTOP_MAX_PROC_SEGMENT] =
{

2
sysdeps/names/procsignal.c
View File

@@ -23,7 +23,7 @@
#include <glibtop.h>
#include <glibtop/procsignal.h>
#include <libgnome/gnome-i18n.h>
#include "libgtop-i18n.h"
const char *glibtop_names_proc_signal [GLIBTOP_MAX_PROC_SIGNAL] =
{

2
sysdeps/names/procstate.c
View File

@@ -23,7 +23,7 @@
#include <glibtop.h>
#include <glibtop/procstate.h>
#include <libgnome/gnome-i18n.h>
#include "libgtop-i18n.h"
const char *glibtop_names_proc_state [GLIBTOP_MAX_PROC_STATE] =
{

2
sysdeps/names/proctime.c
View File

@@ -23,7 +23,7 @@
#include <glibtop.h>
#include <glibtop/proctime.h>
#include <libgnome/gnome-i18n.h>
#include "libgtop-i18n.h"
const char *glibtop_names_proc_time [GLIBTOP_MAX_PROC_TIME] =
{

2
sysdeps/names/procuid.c
View File

@@ -23,7 +23,7 @@
#include <glibtop.h>
#include <glibtop/procuid.h>
#include <libgnome/gnome-i18n.h>
#include "libgtop-i18n.h"
const char *glibtop_names_proc_uid [GLIBTOP_MAX_PROC_UID] =
{

2
sysdeps/names/sem_limits.c
View File

@@ -22,7 +22,7 @@
*/
#include <glibtop/sem_limits.h>
#include <libgnome/gnome-i18n.h>
#include "libgtop-i18n.h"
const char *glibtop_names_sem_limits [GLIBTOP_MAX_SEM_LIMITS] =
{

2
sysdeps/names/shm_limits.c
View File

@@ -22,7 +22,7 @@
*/
#include <glibtop/shm_limits.h>
#include <libgnome/gnome-i18n.h>
#include "libgtop-i18n.h"
const char *glibtop_names_shm_limits [GLIBTOP_MAX_SHM_LIMITS] =
{

2
sysdeps/names/swap.c
View File

@@ -22,7 +22,7 @@
*/
#include <glibtop/swap.h>
#include <libgnome/gnome-i18n.h>
#include "libgtop-i18n.h"
const char *glibtop_names_swap [GLIBTOP_MAX_SWAP] =
{

2
sysdeps/names/sysdeps.c
View File

@@ -22,7 +22,7 @@
#include <config.h>
#include <glibtop/union.h>
#include <glibtop/sysdeps.h>
#include <libgnome/gnome-i18n.h>
#include "libgtop-i18n.h"
const char *glibtop_names_sysdeps [GLIBTOP_MAX_SYSDEPS] =
{

2
sysdeps/names/uptime.c
View File

@@ -22,7 +22,7 @@
*/
#include <glibtop/uptime.h>
#include <libgnome/gnome-i18n.h>
#include "libgtop-i18n.h"
const char *glibtop_names_uptime [GLIBTOP_MAX_UPTIME] =
{