Author: mgoulish
Date: Tue Apr 30 01:07:02 2013
New Revision: 1477435
URL: http://svn.apache.org/r1477435
Log:
QPID-4759 : make both builds put sasl config file in sysconfdir/sasl2
and display default location in qpidd --help output
Modified:
qpid/trunk/qpid/cpp/BuildInstallSettings.cmake
qpid/trunk/qpid/cpp/src/Makefile.am
qpid/trunk/qpid/cpp/src/config.h.cmake
qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
Modified: qpid/trunk/qpid/cpp/BuildInstallSettings.cmake
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/BuildInstallSettings.cmake?rev=1477435&r1=1477434&r2=1477435&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/BuildInstallSettings.cmake (original)
+++ qpid/trunk/qpid/cpp/BuildInstallSettings.cmake Tue Apr 30 01:07:02 2013
@@ -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
Modified: qpid/trunk/qpid/cpp/src/Makefile.am
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/Makefile.am?rev=1477435&r1=1477434&r2=1477435&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/Makefile.am Tue Apr 30 01:07:02 2013
@@ -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\"
Modified: qpid/trunk/qpid/cpp/src/config.h.cmake
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/config.h.cmake?rev=1477435&r1=1477434&r2=1477435&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/config.h.cmake (original)
+++ qpid/trunk/qpid/cpp/src/config.h.cmake Tue Apr 30 01:07:02 2013
@@ -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}
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp?rev=1477435&r1=1477434&r2=1477435&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Tue Apr 30 01:07:02 2013
@@ -136,6 +136,7 @@ Broker::Options::Options(const std::stri
tcpNoDelay(true),
requireEncrypted(false),
knownHosts(knownHostsNone),
+ saslConfigPath(QPIDD_SASLCONF_DIR),
qmf2Support(true),
qmf1Support(true),
queueFlowStopRatio(80),
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
