diff options
| author | Michael Goulish <mgoulish@apache.org> | 2013-04-30 01:07:02 +0000 |
|---|---|---|
| committer | Michael Goulish <mgoulish@apache.org> | 2013-04-30 01:07:02 +0000 |
| commit | e173746ed7d6bbd049830f5e9e688d60c2cbb21d (patch) | |
| tree | f18f3714a04d9c61c5c0cd0cb71c40af2a206394 /qpid/cpp | |
| parent | e51249e7068e30f77fd7986378fa13dfeb7f2133 (diff) | |
| download | qpid-python-e173746ed7d6bbd049830f5e9e688d60c2cbb21d.tar.gz | |
QPID-4759 : make both builds put sasl config file in sysconfdir/sasl2
and display default location in qpidd --help output
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1477435 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/BuildInstallSettings.cmake | 1 | ||||
| -rw-r--r-- | qpid/cpp/src/Makefile.am | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/config.h.cmake | 1 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/broker/Broker.cpp | 1 |
4 files changed, 4 insertions, 1 deletions
diff --git a/qpid/cpp/BuildInstallSettings.cmake b/qpid/cpp/BuildInstallSettings.cmake index d63a61e512..ea9b83c62b 100644 --- a/qpid/cpp/BuildInstallSettings.cmake +++ b/qpid/cpp/BuildInstallSettings.cmake @@ -184,6 +184,7 @@ if (UNIX) set_absolute_install_path (QPIDC_MODULE_DIR ${QPID_INSTALL_LIBDIR}/qpid/client) # Directory to load client plug-in modules from set_absolute_install_path (QPIDD_MODULE_DIR ${QPID_INSTALL_LIBDIR}/qpid/daemon) # Directory to load broker plug-in modules from + set_absolute_install_path (QPIDD_SASLCONF_DIR ${QPID_INSTALL_SASLDIR}) # Directory to put Cyrus SASL config files into #---- # Set RPATH so that installe executables can run without setting diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am index a99a57d32d..0f743a5a39 100644 --- a/qpid/cpp/src/Makefile.am +++ b/qpid/cpp/src/Makefile.am @@ -140,7 +140,7 @@ qpidtest_SCRIPTS = tmoduleexecdir = $(libdir)/qpid/tests tmoduleexec_LTLIBRARIES= -BROKER_CXXFLAGS = -D_IN_QPID_BROKER +BROKER_CXXFLAGS = -D_IN_QPID_BROKER -DQPIDD_SASLCONF_DIR=\"$(sysconfdir)/sasl2\" ## Automake macros to build libraries and executables. qpidd_CXXFLAGS = $(AM_CXXFLAGS) $(BROKER_CXXFLAGS) -DQPIDD_MODULE_DIR=\"$(dmoduleexecdir)\" -DQPIDD_CONF_FILE=\"$(sysconfdir)/qpidd.conf\" -DQPIDC_CONF_FILE=\"$(confdir)/qpidc.conf\" diff --git a/qpid/cpp/src/config.h.cmake b/qpid/cpp/src/config.h.cmake index 5c8c56c749..31fafcdea8 100644 --- a/qpid/cpp/src/config.h.cmake +++ b/qpid/cpp/src/config.h.cmake @@ -53,6 +53,7 @@ #cmakedefine QPID_HAS_CLOCK_GETTIME #cmakedefine BROKER_SASL_NAME "${BROKER_SASL_NAME}" +#cmakedefine QPIDD_SASLCONF_DIR "${QPIDD_SASLCONF_DIR}" #cmakedefine HAVE_SASL ${HAVE_SASL} #cmakedefine HAVE_OPENAIS_CPG_H ${HAVE_OPENAIS_CPG_H} diff --git a/qpid/cpp/src/qpid/broker/Broker.cpp b/qpid/cpp/src/qpid/broker/Broker.cpp index 89dac01e19..87df6569cb 100644 --- a/qpid/cpp/src/qpid/broker/Broker.cpp +++ b/qpid/cpp/src/qpid/broker/Broker.cpp @@ -136,6 +136,7 @@ Broker::Options::Options(const std::string& name) : tcpNoDelay(true), requireEncrypted(false), knownHosts(knownHostsNone), + saslConfigPath(QPIDD_SASLCONF_DIR), qmf2Support(true), qmf1Support(true), queueFlowStopRatio(80), |