The following patch removes all dependencies to libconfuse when
--enable-static-build is used in preparation for removing libconfuse from
srclib.
This allows for a cleaner build process and using the system provided
libconfuse if available or whatever libconfuse library was provided at
compile time with --with-libconfuse as either a statically linked library or a
dynamically linked one.
In systems that don't have a standard package for libconfuse (like cygwin)
it is recommended to use a static binary by requesting --enable-static-build
and the location of a previously compiled (and optionally installed)
libconfuse static library (the default) using --with-libconfuse.
Signed-off-by: Carlo Marcelo Arenas Belon <[EMAIL PROTECTED]>
---
trunk/monitor-core/README.WIN | 2 +-
trunk/monitor-core/configure.in | 38 +++++++++-----------
trunk/monitor-core/gmetad/Makefile.am | 2 +-
trunk/monitor-core/gmetric/Makefile.am | 2 +-
trunk/monitor-core/gmond/Makefile.am | 5 +--
trunk/monitor-core/gmond/modules/cpu/Makefile.am | 2 +-
trunk/monitor-core/gmond/modules/disk/Makefile.am | 2 +-
.../monitor-core/gmond/modules/example/Makefile.am | 2 +-
.../monitor-core/gmond/modules/memory/Makefile.am | 2 +-
.../monitor-core/gmond/modules/network/Makefile.am | 2 +-
.../monitor-core/gmond/modules/python/Makefile.am | 2 +-
.../monitor-core/gmond/modules/status/Makefile.am | 2 +-
.../monitor-core/gmond/modules/system/Makefile.am | 2 +-
trunk/monitor-core/lib/Makefile.am | 2 +-
trunk/monitor-core/srclib/Makefile.am | 2 +-
15 files changed, 32 insertions(+), 37 deletions(-)
diff --git a/trunk/monitor-core/README.WIN b/trunk/monitor-core/README.WIN
index b05245b..262933a 100644
--- a/trunk/monitor-core/README.WIN
+++ b/trunk/monitor-core/README.WIN
@@ -50,7 +50,7 @@ copy all the .h files from /usr/lib/apr/include/apr-1 to
/usr/local/include
cp /usr/local/apr/lib/libapr-1.a /usr/local/lib/
cp /usr/local/apr/lib/libapr-1.la /usr/local/lib/
-Go to srclib/confuse and build the libconfuse library.
+Download libconfuse, build it and install the libconfuse library.
./configure
make
make install
diff --git a/trunk/monitor-core/configure.in b/trunk/monitor-core/configure.in
index 4b305d7..0f6304c 100644
--- a/trunk/monitor-core/configure.in
+++ b/trunk/monitor-core/configure.in
@@ -145,10 +145,6 @@ if test x"$enable_static_build" = xyes ; then
cd srclib/apr && ./configure --cache-file=$ganglia_popdir/config.cache
--prefix=$prefix
cd $ganglia_popdir
- echo $ac_n "${nl}Configuring libconfuse ...${nl}"
- cd srclib/confuse && ./configure --cache-file=$ganglia_popdir/config.cache
--disable-nls --prefix=$prefix
- cd $ganglia_popdir
-
modpathstart="#"
fi
@@ -310,27 +306,27 @@ if test x"$enable_static_build" = xno ; then
exit;
fi
- echo
- echo Checking for confuse
- if test x"$libconfusepath" != x && test x"$libconfusepath" != xyes ; then
- CFLAGS="$CFLAGS -I$libconfusepath/include"
- LDFLAGS="$LDFLAGS -L$libconfusepath/lib"
- echo "Added -I$libconfusepath/include to CFLAGS"
- echo "Added -L$libconfusepath/lib to LDLAGS"
- fi
- AC_CHECK_LIB(confuse, cfg_parse)
- if test $ac_cv_lib_confuse_cfg_parse = yes; then
- echo "Found a suitable Confuse library"
- else
- echo "libconfuse not found"
- exit;
- fi
- echo
-
modpathstart=""
fi
echo
+echo Checking for confuse
+if test x"$libconfusepath" != x && test x"$libconfusepath" != xyes ; then
+ CFLAGS="$CFLAGS -I$libconfusepath/include"
+ LDFLAGS="$LDFLAGS -L$libconfusepath/lib"
+ echo "Added -I$libconfusepath/include to CFLAGS"
+ echo "Added -L$libconfusepath/lib to LDLAGS"
+fi
+AC_CHECK_LIB(confuse, cfg_parse)
+if test $ac_cv_lib_confuse_cfg_parse = yes; then
+ echo "Found a suitable Confuse library"
+else
+ echo "libconfuse not found"
+ exit;
+fi
+echo
+
+echo
echo Checking for expat
if test x"$libexpatpath" != x && test x"$libexpatpath" != xyes ; then
CFLAGS="$CFLAGS -I$libexpatpath/include"
diff --git a/trunk/monitor-core/gmetad/Makefile.am
b/trunk/monitor-core/gmetad/Makefile.am
index 5f33ecd..addeb2c 100644
--- a/trunk/monitor-core/gmetad/Makefile.am
+++ b/trunk/monitor-core/gmetad/Makefile.am
@@ -1,6 +1,6 @@
if STATIC_BUILD
GCFLAGS = -I$(top_builddir)/srclib/apr/include/
-GLDADD = $(top_builddir)/srclib/apr/libapr-0.la
$(top_builddir)/srclib/confuse/src/libconfuse.la
+GLDADD = $(top_builddir)/srclib/apr/libapr-0.la
GLDFLAGS = -static
else
GCFLAGS =
diff --git a/trunk/monitor-core/gmetric/Makefile.am
b/trunk/monitor-core/gmetric/Makefile.am
index c5b0e77..2d09965 100644
--- a/trunk/monitor-core/gmetric/Makefile.am
+++ b/trunk/monitor-core/gmetric/Makefile.am
@@ -1,6 +1,6 @@
if STATIC_BUILD
GCFLAGS = -I$(top_builddir)/srclib/apr/include/
-GLDADD = $(top_builddir)/srclib/apr/libapr-0.la
$(top_builddir)/srclib/confuse/src/libconfuse.la
+GLDADD = $(top_builddir)/srclib/apr/libapr-0.la
GLDFLAGS = -static
else
GCFLAGS = -D_LARGEFILE64_SOURCE
diff --git a/trunk/monitor-core/gmond/Makefile.am
b/trunk/monitor-core/gmond/Makefile.am
index 0a920a2..1def98d 100644
--- a/trunk/monitor-core/gmond/Makefile.am
+++ b/trunk/monitor-core/gmond/Makefile.am
@@ -2,8 +2,8 @@ SUBDIRS = gstat modules python_modules
EXTRA_DIST = gmond.aix.init gmond.init gmond.init.SuSE gmond.conf.5
gmond.conf.html conf.pod
if STATIC_BUILD
-GCFLAGS = -I$(top_builddir)/srclib/apr/include/
-I$(top_builddir)/srclib/confuse/src/
-GLDADD = $(top_builddir)/srclib/apr/libapr-0.la
$(top_builddir)/srclib/confuse/src/libconfuse.la \
+GCFLAGS = -I$(top_builddir)/srclib/apr/include/
+GLDADD = $(top_builddir)/srclib/apr/libapr-0.la \
modules/disk/mod_disk.lo modules/cpu/mod_cpu.lo modules/cpu/mod_load.lo
\
modules/memory/mod_mem.lo modules/network/mod_net.lo \
modules/system/mod_proc.lo modules/system/mod_sys.lo
@@ -35,7 +35,6 @@ gmond.conf.html: conf.pod
#monitor.c server.c listen.c cleanup.c \
#metric.h dtd.h
-# Add -lintl??? for libconfuse on cygwin?
gmond_LDADD = $(top_builddir)/libmetrics/libmetrics.la \
$(top_builddir)/lib/libganglia.la \
$(top_builddir)/lib/libgetopthelper.a \
diff --git a/trunk/monitor-core/gmond/modules/cpu/Makefile.am
b/trunk/monitor-core/gmond/modules/cpu/Makefile.am
index 37a21ce..71a4076 100755
--- a/trunk/monitor-core/gmond/modules/cpu/Makefile.am
+++ b/trunk/monitor-core/gmond/modules/cpu/Makefile.am
@@ -1,7 +1,7 @@
AM_CFLAGS = -D_LARGEFILE64_SOURCE -I$(top_builddir)/gmond
-I$(top_builddir)/libmetrics -I$(top_builddir)/lib
if STATIC_BUILD
-AM_CFLAGS += -I$(top_builddir)/srclib/apr/include/
-I$(top_builddir)/srclib/confuse/src/
+AM_CFLAGS += -I$(top_builddir)/srclib/apr/include/
noinst_LTLIBRARIES = libmodcpu.la
libmodcpu_la_SOURCES = mod_cpu.c mod_load.c
else
diff --git a/trunk/monitor-core/gmond/modules/disk/Makefile.am
b/trunk/monitor-core/gmond/modules/disk/Makefile.am
index d816a2f..7b1631c 100755
--- a/trunk/monitor-core/gmond/modules/disk/Makefile.am
+++ b/trunk/monitor-core/gmond/modules/disk/Makefile.am
@@ -1,7 +1,7 @@
AM_CFLAGS = -D_LARGEFILE64_SOURCE -I$(top_builddir)/gmond
-I$(top_builddir)/libmetrics -I$(top_builddir)/lib
if STATIC_BUILD
-AM_CFLAGS += -I$(top_builddir)/srclib/apr/include/
-I$(top_builddir)/srclib/confuse/src/
+AM_CFLAGS += -I$(top_builddir)/srclib/apr/include/
noinst_LTLIBRARIES = libmoddisk.la
libmoddisk_la_SOURCES = mod_disk.c
else
diff --git a/trunk/monitor-core/gmond/modules/example/Makefile.am
b/trunk/monitor-core/gmond/modules/example/Makefile.am
index 92eac77..92b8d49 100755
--- a/trunk/monitor-core/gmond/modules/example/Makefile.am
+++ b/trunk/monitor-core/gmond/modules/example/Makefile.am
@@ -1,7 +1,7 @@
AM_CFLAGS = -D_LARGEFILE64_SOURCE -I$(top_builddir)/gmond
-I$(top_builddir)/libmetrics -I$(top_builddir)/lib
if STATIC_BUILD
-AM_CFLAGS += -I$(top_builddir)/srclib/apr/include/
-I$(top_builddir)/srclib/confuse/src/
+AM_CFLAGS += -I$(top_builddir)/srclib/apr/include/
noinst_LTLIBRARIES = libmodexample.la
libmodexample_la_SOURCES = mod_example.c
else
diff --git a/trunk/monitor-core/gmond/modules/memory/Makefile.am
b/trunk/monitor-core/gmond/modules/memory/Makefile.am
index f7c9c07..e765d9d 100755
--- a/trunk/monitor-core/gmond/modules/memory/Makefile.am
+++ b/trunk/monitor-core/gmond/modules/memory/Makefile.am
@@ -1,7 +1,7 @@
AM_CFLAGS = -D_LARGEFILE64_SOURCE -I$(top_builddir)/gmond
-I$(top_builddir)/libmetrics -I$(top_builddir)/lib
if STATIC_BUILD
-AM_CFLAGS += -I$(top_builddir)/srclib/apr/include/
-I$(top_builddir)/srclib/confuse/src/
+AM_CFLAGS += -I$(top_builddir)/srclib/apr/include/
noinst_LTLIBRARIES = libmodmem.la
libmodmem_la_SOURCES = mod_mem.c
else
diff --git a/trunk/monitor-core/gmond/modules/network/Makefile.am
b/trunk/monitor-core/gmond/modules/network/Makefile.am
index 791feb8..998ffff 100755
--- a/trunk/monitor-core/gmond/modules/network/Makefile.am
+++ b/trunk/monitor-core/gmond/modules/network/Makefile.am
@@ -1,7 +1,7 @@
AM_CFLAGS = -D_LARGEFILE64_SOURCE -I$(top_builddir)/gmond
-I$(top_builddir)/libmetrics -I$(top_builddir)/lib
if STATIC_BUILD
-AM_CFLAGS += -I$(top_builddir)/srclib/apr/include/
-I$(top_builddir)/srclib/confuse/src/
+AM_CFLAGS += -I$(top_builddir)/srclib/apr/include/
noinst_LTLIBRARIES = libmodnet.la
libmodnet_la_SOURCES = mod_net.c
else
diff --git a/trunk/monitor-core/gmond/modules/python/Makefile.am
b/trunk/monitor-core/gmond/modules/python/Makefile.am
index 96f0c4a..27cbc1a 100644
--- a/trunk/monitor-core/gmond/modules/python/Makefile.am
+++ b/trunk/monitor-core/gmond/modules/python/Makefile.am
@@ -1,7 +1,7 @@
AM_CFLAGS = -D_LARGEFILE64_SOURCE -I$(top_builddir)/gmond
-I$(top_builddir)/libmetrics -I$(top_builddir)/lib
if STATIC_BUILD
-AM_CFLAGS += -I$(top_builddir)/srclib/apr/include/
-I$(top_builddir)/srclib/confuse/src/ @PYTHON_INCLUDES@
+AM_CFLAGS += -I$(top_builddir)/srclib/apr/include/ @PYTHON_INCLUDES@
noinst_LTLIBRARIES = libmodpython.la
libmodpython_la_SOURCES = mod_python.c
else
diff --git a/trunk/monitor-core/gmond/modules/status/Makefile.am
b/trunk/monitor-core/gmond/modules/status/Makefile.am
index cf35a41..9bc3fe5 100755
--- a/trunk/monitor-core/gmond/modules/status/Makefile.am
+++ b/trunk/monitor-core/gmond/modules/status/Makefile.am
@@ -1,7 +1,7 @@
AM_CFLAGS = -D_LARGEFILE64_SOURCE -I$(top_builddir)/gmond
-I$(top_builddir)/libmetrics -I$(top_builddir)/lib
if STATIC_BUILD
-AM_CFLAGS += -I$(top_builddir)/srclib/apr/include/
-I$(top_builddir)/srclib/confuse/src/
+AM_CFLAGS += -I$(top_builddir)/srclib/apr/include/
noinst_LTLIBRARIES = libmodstatus.la
libmodstatus_la_SOURCES = mod_gstatus.c
else
diff --git a/trunk/monitor-core/gmond/modules/system/Makefile.am
b/trunk/monitor-core/gmond/modules/system/Makefile.am
index 033e3d1..453aa90 100755
--- a/trunk/monitor-core/gmond/modules/system/Makefile.am
+++ b/trunk/monitor-core/gmond/modules/system/Makefile.am
@@ -1,7 +1,7 @@
AM_CFLAGS = -D_LARGEFILE64_SOURCE -I$(top_builddir)/gmond
-I$(top_builddir)/libmetrics -I$(top_builddir)/lib
if STATIC_BUILD
-AM_CFLAGS += -I$(top_builddir)/srclib/apr/include/
-I$(top_builddir)/srclib/confuse/src/
+AM_CFLAGS += -I$(top_builddir)/srclib/apr/include/
noinst_LTLIBRARIES = libmodsys.la
libmodsys_la_SOURCES = mod_proc.c mod_sys.c
else
diff --git a/trunk/monitor-core/lib/Makefile.am
b/trunk/monitor-core/lib/Makefile.am
index 426f872..a00d5b3 100644
--- a/trunk/monitor-core/lib/Makefile.am
+++ b/trunk/monitor-core/lib/Makefile.am
@@ -2,7 +2,7 @@
#.c.x: rpcgen $<
if STATIC_BUILD
-GCFLAGS = -I$(top_builddir)/srclib/apr/include/
-I$(top_builddir)/srclib/apr/include/arch/unix/
-I$(top_builddir)/srclib/confuse/src
+GCFLAGS = -I$(top_builddir)/srclib/apr/include/
-I$(top_builddir)/srclib/apr/include/arch/unix/
GLDADD =
GLDFLAGS = -static
else
diff --git a/trunk/monitor-core/srclib/Makefile.am
b/trunk/monitor-core/srclib/Makefile.am
index 29ee6f5..37d4f7d 100644
--- a/trunk/monitor-core/srclib/Makefile.am
+++ b/trunk/monitor-core/srclib/Makefile.am
@@ -1,6 +1,6 @@
if STATIC_BUILD
-SUBDIRS = apr confuse
+SUBDIRS = apr
else
SUBDIRS =
endif
--
1.5.3.7
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Ganglia-developers mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ganglia-developers
