Permalink
Browse files

This commit was manufactured by cvs2svn to create tag

'Beta_06192002_2_4_2_b1'.
  • Loading branch information...
1 parent 3c3cc58 commit 1169b2ce5b5ef30f93c740f8197fb768e9533aff (no author) committed Jun 20, 2002
Showing with 18 additions and 3 deletions.
  1. +2 −0 monitor-core/AUTHORS
  2. +14 −2 monitor-core/configure.in
  3. +2 −1 monitor-core/gmond/gmond.c
View
@@ -1 +1,3 @@
Matt Massie <massie@cs.berkeley.edu>
+and many others...
+http://sourceforge.net/project/memberlist.php?group_id=43021
View
@@ -22,7 +22,7 @@ dnl
AC_INIT(gmond/gmond.c)
AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE(ganglia-monitor-core, 2.4.1)
+AM_INIT_AUTOMAKE(ganglia-monitor-core, 2.4.1b1)
AC_CANONICAL_HOST
AM_CONFIG_HEADER(config.h)
@@ -56,6 +56,10 @@ AC_ARG_ENABLE(debug,
[ CFLAGS="-O2 "
AC_DEFINE(DEBUG, 0)])
+AC_ARG_ENABLE(gexec,
+[ --enable-gexec turn on gexec support (platform-specific) ],
+AC_DEFINE(SUPPORT_GEXEC, 1), AC_DEFINE(SUPPORT_GEXEC, 0))
+
AC_ARG_ENABLE(pedantic,
[ --enable-pedantic turn on pedantic mode during compile],
[ CFLAGS="$CFLAGS --pedantic" ],)
@@ -241,7 +245,8 @@ dnl If the compiler is gcc, enable all warnings. Main purpose is to
dnl catch any function call where the function has not been prototyped.
dnl
dnl Add "-Wcast-qual again later"...
-if test "$ac_cv_prog_gcc" = yes; then
+dnl if test "$ac_cv_prog_gcc" = yes; then
+if test "$ac_cv_gcc" = yes; then
CFLAGS="$CFLAGS -Wall -Wshadow -Wpointer-arith -Wcast-align -Wstrict-prototypes"
if test "$enable_memcheck" = yes; then
CFLAGS="$CFLAGS -fcheck-memory-usage "
@@ -265,17 +270,24 @@ case "$host" in
*ia64*) AC_DEFINE(IA64);;
*aix*) metric_source="aix.c"
CFLAGS="$CFLAGS -D_ALL_SOURCE -DAIX"
+ AC_DEFINE(SUPPORT_GEXEC, 0)
AC_DEFINE(AIX);;
*hpux*) metric_source="hpux.c"
CFLAGS="$CFLAGS -D_HPUX_SOURCE"
+ AC_DEFINE(SUPPORT_GEXEC, 0)
AC_DEFINE(HPUX);;
*irix*) metric_source="irix.c"
+ AC_DEFINE(SUPPORT_GEXEC, 0)
CFLAGS="$CFLAGS -D_IRIX_SOURCE"
AC_DEFINE(IRIX);;
*osf*) metric_source="osf.c"
CFLAGS="$CFLAGS -D_SOCKADDR_LEN"
AC_DEFINE(OSF);;
*solaris*) metric_source="solaris.c"
+ echo " *** WARNING: Please make sure you use a 64-bit compiler, linker and *** "
+ echo " *** library set if you are running a 64-bit Solaris kernel! This *** "
+ echo " *** applies if you are running Solaris 7 or later! *** "
+ AC_DEFINE(SUPPORT_GEXEC, 0)
if test "$ac_cv_prog_gcc" = yes; then
CFLAGS="$CFLAGS -D__EXTENSIONS__ -DHAVE_STRERROR"
else
@@ -1,3 +1,4 @@
+/* $Id$ */
#include "gangliaconf.h"
#include "dotconf.h"
#include <ganglia/gmond_config.h>
@@ -59,7 +60,7 @@ gexec_func ( void )
{
g_val_t val;
- if( config.no_gexec )
+ if( config.no_gexec || ( SUPPORT_GEXEC == 0 ) )
snprintf(val.str, MAX_G_STRING_SIZE, "%s", "OFF");
else
snprintf(val.str, MAX_G_STRING_SIZE, "%s", "ON");

0 comments on commit 1169b2c

Please sign in to comment.