From c39bbe82781e6b500aaf89af8442f43b857a72f9 Mon Sep 17 00:00:00 2001
From: Michael Goulish <mgoulish@apache.org>
Date: Tue, 30 Apr 2013 01:07:02 +0000
Subject: 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/qpid@1477435 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/Makefile.am            | 2 +-
 cpp/src/config.h.cmake         | 1 +
 cpp/src/qpid/broker/Broker.cpp | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'cpp/src')

diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am
index a99a57d32d..0f743a5a39 100644
--- a/cpp/src/Makefile.am
+++ b/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/cpp/src/config.h.cmake b/cpp/src/config.h.cmake
index 5c8c56c749..31fafcdea8 100644
--- a/cpp/src/config.h.cmake
+++ b/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/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index 89dac01e19..87df6569cb 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/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),
-- 
cgit v1.2.1