diff options
| author | Gordon Sim <gsim@apache.org> | 2012-10-19 21:13:30 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2012-10-19 21:13:30 +0000 |
| commit | 1cdf1d837aa11f99927c5b324c8a2b4992d14aad (patch) | |
| tree | dff370bdfb5bccb062f462b41fe62a9f670224c6 /cpp | |
| parent | b6fb3e7b0ea192f98c470fe48f7f4386cade7b64 (diff) | |
| download | qpid-python-1cdf1d837aa11f99927c5b324c8a2b4992d14aad.tar.gz | |
QPID-4368: Fixes to autoconf build for AMQP 1.0 plugins
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1400295 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/configure.ac | 2 | ||||
| -rw-r--r-- | cpp/src/Makefile.am | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/cpp/configure.ac b/cpp/configure.ac index 872a8853e3..4d39b87879 100644 --- a/cpp/configure.ac +++ b/cpp/configure.ac @@ -302,7 +302,7 @@ AC_ARG_WITH([proton], AS_HELP_STRING([--with-proton], [Build with the proton too 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 diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am index e121bbb30c..ba2d6a9219 100644 --- a/cpp/src/Makefile.am +++ b/cpp/src/Makefile.am @@ -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 |