[libgtop] Rename NEED_LIBGTOP to LIBGTOP_NEED_SERVER.
- From: Robert Roth <robertroth src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgtop] Rename NEED_LIBGTOP to LIBGTOP_NEED_SERVER.
- Date: Thu, 25 Jun 2015 23:58:26 +0000 (UTC)
commit f76b37be1bea2451707a08ae919d9cdf0dc3823d
Author: Benoit Dejean <bdejean gmail com>
Date: Sat Feb 28 02:12:23 2015 +0100
Rename NEED_LIBGTOP to LIBGTOP_NEED_SERVER.
libgtop-sysdeps.m4 | 8 ++++----
src/Makefile.am | 2 +-
src/daemon/Makefile.am | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/libgtop-sysdeps.m4 b/libgtop-sysdeps.m4
index 1ee8e2f..747fc88 100644
--- a/libgtop-sysdeps.m4
+++ b/libgtop-sysdeps.m4
@@ -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 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'.
+dnl * 'libgtop_need_server' - is the server really needed? Defines 'LIBGTOP_NEED_SERVER'
+dnl if true; defines conditional 'LIBGTOP_NEED_SERVER'.
AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
AC_REQUIRE([AC_CANONICAL_HOST])
@@ -311,7 +311,7 @@ main (void)
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(LIBGTOP_NEED_SERVER, 1, [Define if libgtop server is required])
fi
if test x$libgtop_use_machine_h = xyes ; then
@@ -319,7 +319,7 @@ main (void)
[Define if machine.h in libgtop sysdeps dir])
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_FSUSAGE, test x$libgtop_sysdeps_private_fsusage = xyes)
])
diff --git a/src/Makefile.am b/src/Makefile.am
index 6378b66..d9dbf4d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-if NEED_LIBGTOP
+if LIBGTOP_NEED_SERVER
daemon_SUBDIRS = daemon
else
daemon_SUBDIRS =
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index 6b5ba5c..64aa8ea 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -18,7 +18,7 @@ INCLUDES = $(LIBGTOP_CFLAGS) @INCLUDES@ -D_BSD \
-DLIBGTOP_COMPILE_VERSION="\"`uname -v`\"" \
-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_common = $(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la
else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]