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

Rename NEED_LIBGTOP to LIBGTOP_NEED_SERVER.

Browse Source
This commit is contained in:
Benoit Dejean
2015-02-28 02:12:23 +01:00
committed by Robert Roth
parent b2fee3e111
commit f76b37be1b
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libgtop-sysdeps.m4
View File

@@ -7,8 +7,8 @@ dnl * 'libgtop_sysdeps_dir' - sysdeps dir for libgtop.
dnl * 'libgtop_use_machine_h' - some of system dependend parts of libgtop provide 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 their own header file. In this case we need to
dnl define 'HAVE_GLIBTOP_MACHINE_H'. dnl define 'HAVE_GLIBTOP_MACHINE_H'.
dnl * 'libgtop_need_server' - is the server really needed? Defines 'NEED_LIBGTOP' dnl * 'libgtop_need_server' - is the server really needed? Defines 'LIBGTOP_NEED_SERVER'
dnl if true; defines conditional 'NEED_LIBGTOP'. dnl if true; defines conditional 'LIBGTOP_NEED_SERVER'.
AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([AC_CANONICAL_HOST])
@@ -311,7 +311,7 @@ main (void)
AC_MSG_RESULT($libgtop_need_server) AC_MSG_RESULT($libgtop_need_server)
if test x$libgtop_need_server = xyes ; then if test x$libgtop_need_server = xyes ; then
AC_DEFINE(NEED_LIBGTOP, 1, [Define if libgtop is required]) AC_DEFINE(LIBGTOP_NEED_SERVER, 1, [Define if libgtop server is required])
fi fi
if test x$libgtop_use_machine_h = xyes ; then if test x$libgtop_use_machine_h = xyes ; then
@@ -319,7 +319,7 @@ main (void)
[Define if machine.h in libgtop sysdeps dir]) [Define if machine.h in libgtop sysdeps dir])
fi fi
AM_CONDITIONAL(NEED_LIBGTOP, test x$libgtop_need_server = xyes) AM_CONDITIONAL(LIBGTOP_NEED_SERVER, test x$libgtop_need_server = xyes)
AM_CONDITIONAL(LIBGTOP_SYSDEPS_PRIVATE_MOUNTLIST, test x$libgtop_sysdeps_private_mountlist = xyes) AM_CONDITIONAL(LIBGTOP_SYSDEPS_PRIVATE_MOUNTLIST, test x$libgtop_sysdeps_private_mountlist = xyes)
AM_CONDITIONAL(LIBGTOP_SYSDEPS_PRIVATE_FSUSAGE, test x$libgtop_sysdeps_private_fsusage = xyes) AM_CONDITIONAL(LIBGTOP_SYSDEPS_PRIVATE_FSUSAGE, test x$libgtop_sysdeps_private_fsusage = xyes)
]) ])

2
src/Makefile.am
View File

@@ -1,4 +1,4 @@
if NEED_LIBGTOP if LIBGTOP_NEED_SERVER
daemon_SUBDIRS = daemon daemon_SUBDIRS = daemon
else else
daemon_SUBDIRS = daemon_SUBDIRS =

2
src/daemon/Makefile.am
View File

@@ -18,7 +18,7 @@ INCLUDES = $(LIBGTOP_CFLAGS) @INCLUDES@ -D_BSD \
-DLIBGTOP_COMPILE_VERSION="\"`uname -v`\"" \ -DLIBGTOP_COMPILE_VERSION="\"`uname -v`\"" \
-DLIBGTOP_COMPILE_MACHINE="\"`uname -m`\"" -DLIBGTOP_COMPILE_MACHINE="\"`uname -m`\""
if NEED_LIBGTOP if LIBGTOP_NEED_SERVER
suid_sysdeps = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid-2.0.la suid_sysdeps = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid-2.0.la
suid_common = $(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la suid_common = $(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la
else else