summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2004-03-04 15:29:16 +0000
committerBastien Nocera <hadess@src.gnome.org>2004-03-04 15:29:16 +0000
commit2ae3495a876e268626e08091f7017be78b20da97 (patch)
treeabaa8c1baaa663258a7077e333c7adf2ccbd18ef /src
parentbbea6f3e166847df1980e579acaee6b2a1d31871 (diff)
downloadlibgtop-2ae3495a876e268626e08091f7017be78b20da97.tar.gz
remove dependency on libgnome, check for linux/isdn.h for distros using
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
Diffstat (limited to 'src')
-rw-r--r--src/daemon/ChangeLog6
-rw-r--r--src/daemon/Makefile.am7
-rw-r--r--src/daemon/gnuserv.c2
3 files changed, 11 insertions, 4 deletions
diff --git a/src/daemon/ChangeLog b/src/daemon/ChangeLog
index 161233d5..9eb1e571 100644
--- a/src/daemon/ChangeLog
+++ b/src/daemon/ChangeLog
@@ -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:
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index f55090ef..11c310d5 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -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
diff --git a/src/daemon/gnuserv.c b/src/daemon/gnuserv.c
index ada70048..febdcd6f 100644
--- a/src/daemon/gnuserv.c
+++ b/src/daemon/gnuserv.c
@@ -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>