From mboxrd@z Thu Jan  1 00:00:00 1970
From: Lon Hohberger <lhh@redhat.com>
Date: Mon, 10 Nov 2008 12:03:03 -0500
Subject: [Cluster-devel] [PATCH] Fix rgmanager -DNO_CCS build
Message-ID: <1226336583.16686.12.camel@ayanami>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

Rgmanager is being built with -DNO_CCS, which would cause all sorts of
problems.  Some files will be reading from libccs while others would do
things by reading from libxml2 (e.g. -DNO_CCS) directly.  During
configuration, this could cause a number problems.

This patch fixes the build, but as it is alters part of the build
system, I will not commit it.

-- Lon

diff --git a/make/cobj.mk b/make/cobj.mk
index b484f6b..a009927 100644
--- a/make/cobj.mk
+++ b/make/cobj.mk
@@ -7,7 +7,7 @@
 
 # used by rgmanager/src/daemons
 %-noccs.o: $(S)/%.c
-	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS) $(NOCCS_CFLAGS) -c -o $@ $<
 
 # used by fence/agents/xvm
 %-standalone.o: $(S)/%.c
diff --git a/rgmanager/src/daemons/Makefile
b/rgmanager/src/daemons/Makefile
index df07aab..22d55b0 100644
--- a/rgmanager/src/daemons/Makefile
+++ b/rgmanager/src/daemons/Makefile
@@ -53,7 +53,7 @@ CFLAGS += `xml2-config --cflags` -I${readlineincdir}
-I${slangincdir}
 CFLAGS += -I$(S)/../../include
 CFLAGS += -I${incdir}
 
-EXTRA_CFLAGS += -DNO_CCS
+NOCCS_CFLAGS += -DNO_CCS
 
 LDFLAGS += -L../clulib -lclulib
 LDFLAGS += -L${libdir}