From e358a396a7c616ebc88a64461a5202e78d0a660b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Thu, 9 Aug 2012 11:33:10 +0000
Subject: [PATCH] ActiveMQ with more strict compiler (fixes build on Fedora
 17).

---
 org.glite.lb.logger-msg/Makefile               | 8 ++++----
 org.glite.lb.logger-msg/examples/cmsclient.cpp | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/org.glite.lb.logger-msg/Makefile b/org.glite.lb.logger-msg/Makefile
index 02c0de4..dc0f4fc 100644
--- a/org.glite.lb.logger-msg/Makefile
+++ b/org.glite.lb.logger-msg/Makefile
@@ -33,8 +33,8 @@ SOURCES_EXEC=src/msg-brokers
 
 VERSION=-DVERSION=\"GLite-${version}\"
 
-ACTIVEMQ_CFLAGS?=`PKG_CONFIG_PATH=${activemq_prefix}/${libdir}/pkgconfig pkg-config --cflags activemq-cpp`
-ACTIVEMQ_LIBS?=-L${activemq_prefix}/${libdir} -lactivemq-cpp
+ACTIVEMQ_CPP_CFLAGS?=`${activemq_prefix}/bin/activemqcpp-config --cflags`
+ACTIVEMQ_CPP_LIBS?=`${activemq_prefix}/bin/activemqcpp-config --libs`
 
 CPPUNIT_LIBS?=-L${cppunit_prefix}/${libdir} -lcppunit
 CPPUNIT_CFLAGS?=-I${cppunit_prefix}/include
@@ -44,7 +44,7 @@ GLITE_LBJP_COMMON_GSS_CFLAGS?=`PKG_CONFIG_PATH=$$PKG_CONFIG_PATH:${PREFIX}${pref
 DEBUG:=-g -O0
 CFLAGS:=${DEBUG} \
 	-I${stagedir}${prefix}/include -I${top_srcdir}/src \
-	${ACTIVEMQ_CFLAGS} \
+	${ACTIVEMQ_CPP_CFLAGS} \
 	-D_GNU_SOURCE \
 	${COVERAGE_FLAGS} \
 	${VERSION} ${LB_STANDALONE_FLAGS} ${LB_PERF_FLAGS} \
@@ -71,7 +71,7 @@ HDRS:=
 
 COMMON_LIB:=
 
-EXT_LIB:=${ACTIVEMQ_LIBS}
+EXT_LIB:=${ACTIVEMQ_CPP_LIBS}
 
 GLITE_GSS_LIB:=
 
diff --git a/org.glite.lb.logger-msg/examples/cmsclient.cpp b/org.glite.lb.logger-msg/examples/cmsclient.cpp
index d703cf2..5951cef 100644
--- a/org.glite.lb.logger-msg/examples/cmsclient.cpp
+++ b/org.glite.lb.logger-msg/examples/cmsclient.cpp
@@ -79,7 +79,7 @@ public:
 		this->clientAck = clientAck;
 	}
 
-	virtual ~SimpleAsyncConsumer(){
+	virtual ~SimpleAsyncConsumer() throw(){
 		this->cleanup();
 	}
 
@@ -132,7 +132,7 @@ public:
 	}
 
 	// Called from the consumer since this class is a registered MessageListener.
-	virtual void onMessage( const Message* message ){
+	virtual void onMessage( const Message* message ) throw() {
 
 		static int count = 0;
 
@@ -157,6 +157,8 @@ public:
 			fflush(outputfile);
 		} catch (CMSException& e) {
 			e.printStackTrace();
+		} catch (Exception& e) {
+			e.printStackTrace();
 		}
 	}
 
-- 
1.8.2.3