diff options
| author | Stephen D. Huston <shuston@apache.org> | 2009-04-23 22:59:12 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2009-04-23 22:59:12 +0000 |
| commit | 3c95f9a289fee6a3b43608ec2ac95f841c43e3ff (patch) | |
| tree | 5860c778c3e2b2c6c23b49887ae870cb5d4558ff /cpp/src/posix/QpiddBroker.cpp | |
| parent | 7db52d95099fb7ae237277f12e4e368cf643f174 (diff) | |
| download | qpid-python-3c95f9a289fee6a3b43608ec2ac95f841c43e3ff.tar.gz | |
Merge in initial changes to allow building with CMake; rubygen and managementgen can now generate either .mk files or .cmake files as needed; CONF_FILE and MODULE_DIR macros now have broker/client counterparts QPIDD_CONF_FILE, QPIDD_MODULE_DIR, QPIDC_CONF_FILE, QPIDC_MODULE_DIR configurable by cmake
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@768085 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/posix/QpiddBroker.cpp')
| -rw-r--r-- | cpp/src/posix/QpiddBroker.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cpp/src/posix/QpiddBroker.cpp b/cpp/src/posix/QpiddBroker.cpp index ba1ef640df..aa934571be 100644 --- a/cpp/src/posix/QpiddBroker.cpp +++ b/cpp/src/posix/QpiddBroker.cpp @@ -18,6 +18,7 @@ * */ +#include "config.h" #include "qpidd.h" #include "qpid/Exception.h" #include "qpid/broker/Broker.h" @@ -37,8 +38,8 @@ using qpid::broker::Daemon; BootstrapOptions::BootstrapOptions(const char* argv0) : qpid::Options("Options"), - common("", CONF_FILE), - module(MODULE_DIR), + common("", QPIDD_CONF_FILE), + module(QPIDD_MODULE_DIR), log(argv0) { add(common); @@ -89,8 +90,8 @@ struct QpiddPosixOptions : public QpiddOptionsPrivate { QpiddOptions::QpiddOptions(const char* argv0) : qpid::Options("Options"), - common("", CONF_FILE), - module(MODULE_DIR), + common("", QPIDD_CONF_FILE), + module(QPIDD_MODULE_DIR), log(argv0) { add(common); |