Author: gsim
Date: Fri Oct 19 21:13:30 2012
New Revision: 1400295
URL: http://svn.apache.org/viewvc?rev=1400295&view=rev
Log:
QPID-4368: Fixes to autoconf build for AMQP 1.0 plugins
Modified:
qpid/trunk/qpid/cpp/configure.ac
qpid/trunk/qpid/cpp/src/Makefile.am
Modified: qpid/trunk/qpid/cpp/configure.ac
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/configure.ac?rev=1400295&r1=1400294&r2=1400295&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/configure.ac (original)
+++ qpid/trunk/qpid/cpp/configure.ac Fri Oct 19 21:13:30 2012
@@ -302,7 +302,7 @@ AC_ARG_WITH([proton], AS_HELP_STRING([--
AS_IF([test "x$with_proton" = "xyes"], [
PKG_CHECK_MODULES([PROTON], [libqpid-proton])
])
-AM_CONDITIONAL([HAVE_PROTON], [test "x$have_proton" = xyes])
+AM_CONDITIONAL([HAVE_PROTON], [test "x$with_proton" = "xyes"])
# Setup --with-xml/--without-xml as arguments to configure
Modified: qpid/trunk/qpid/cpp/src/Makefile.am
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/Makefile.am?rev=1400295&r1=1400294&r2=1400295&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/Makefile.am Fri Oct 19 21:13:30 2012
@@ -777,7 +777,8 @@ amqp_la_SOURCES = \
qpid/broker/amqp/Translation.h \
qpid/broker/amqp/Translation.cpp
-amqp_la_LDFLAGS = $(PLUGINLDFLAGS)
+amqp_la_CXXFLAGS=$(AM_CXXFLAGS) $(PROTON_CFLAGS)
+amqp_la_LDFLAGS = $(PLUGINLDFLAGS) $(PROTON_LIBS)
cmoduleexec_LTLIBRARIES += amqpc.la
amqpc_la_LIBADD = libqpidcommon.la
@@ -805,7 +806,8 @@ amqpc_la_SOURCES = \
qpid/messaging/amqp/TcpTransport.h \
qpid/messaging/amqp/TcpTransport.cpp
-amqpc_la_LDFLAGS = $(PLUGINLDFLAGS)
+amqpc_la_CXXFLAGS=$(AM_CXXFLAGS) $(PROTON_CFLAGS)
+amqpc_la_LDFLAGS = $(PLUGINLDFLAGS) $(PROTON_LIBS)
endif #HAVE_PROTON
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
