[Sblim-commit] Git: gather - Metric Data Gatherer branch, master, updated. 941baf1c501f75c330b0c7d39b1bbb7c5354cab5

[Tyrel D. <ty...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gather - Metric Data Gatherer".

The branch, master has been updated
       via  941baf1c501f75c330b0c7d39b1bbb7c5354cab5 (commit)
      from  a0bba6b993f1249961e54211ef4a0387ffc38d9b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 941baf1c501f75c330b0c7d39b1bbb7c5354cab5
Author: Tyrel Datwyler <ty...@li...>
Date:   Thu Feb 7 16:28:28 2013 -0800

    Fixed 3196679: remove sysfs dependency when not building z plugins

-----------------------------------------------------------------------

Summary of changes:
diff --git a/Makefile.am b/Makefile.am
index 8001360..f5ffa21 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -102,6 +102,14 @@ Z_REPOS_LIBS=librepositoryzECKD.la \
              librepositoryzCEC.la \
              librepositoryzLPAR.la \
              librepositoryzCH.la
+
+Z_LTLIBS=libsysfswrapper.la \
+	 libhypfs.la \
+	 liblparutil.la \
+	 libchannelutil.la
+
+Z_PROGS=hyptest \
+	channelclt
 endif
 
 # ADD EXTRA DOC FILES IF PRESENT
@@ -140,7 +148,7 @@ noinst_HEADERS = gatherc.h marshal.h mlist.h mplugmgr.h \
 # Gather support utility libraries
 lib_LTLIBRARIES = libgatherutil.la libmcserv.la librcserv.la \
 	librrepos.la librepos.la libgather.la librgather.la \
-	libsysfswrapper.la libhypfs.la liblparutil.la libchannelutil.la
+	$(Z_LTLIBS)
 
 libgatherutil_la_SOURCES = util/mrwlock.c util/commheap.c util/commutil.c \
 	util/gatherutil.c util/mcfg.c util/gathercfg.c util/reposcfg.c \
@@ -180,7 +188,7 @@ liblparutil_la_LIBADD = libhypfs.la
 
 libchannelutil_la_SOURCES = plugin/channelutil.c plugin/channelutil.h
 libchannelutil_la_LIBADD = libsysfswrapper.la
-libchannelutil_la_LDFLAGS = -lsysfs
+libchannelutil_la_LDFLAGS = $(ZHYPLIBS)
 
 # Gather daemons
 sbin_PROGRAMS = gatherd reposd
@@ -314,7 +322,7 @@ librepositoryStorage_la_LDFLAGS=$(PLUG_FLAGS)
 # Gather utility test programs (not installed)
 noinst_PROGRAMS = mcfgtest mtracetest merrnotest mcstest mcctest \
 	rcstest rcctest \
-        hyptest channelclt
+        $(Z_PROGS)
 
 mcfgtest_SOURCES = util/mcfgtest.c
 mcfgtest_LDADD = libgatherutil.la
diff --git a/NEWS b/NEWS
index 35b3c3a..c0c3646 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ Changes in Version 2.2.8
 
 Bugs fixed:
 - 3603719 Clean up configuration toolchain and fix DSO linking
+- 3196679 remove sysfs dependency when not building z plugins		
 
 Features added:
 - 2284848 CPU utilization should account for steal-time


hooks/post-receive
-- 
gather - Metric Data Gatherer