summaryrefslogtreecommitdiff
path: root/qpid/cpp/src
diff options
context:
space:
mode:
authorAndrew Stitcher <astitcher@apache.org>2010-03-17 18:49:56 +0000
committerAndrew Stitcher <astitcher@apache.org>2010-03-17 18:49:56 +0000
commit83fc4edb85d000c2bd33fd4d9bab4c23aac20302 (patch)
tree77d44773b89957b252653ae55b9e46d6bcc89c34 /qpid/cpp/src
parentf9910e9a26fe2c5c12f32187fdb3525ceb9cd873 (diff)
downloadqpid-python-83fc4edb85d000c2bd33fd4d9bab4c23aac20302.tar.gz
Fixed previous broken change which attempted to get version at configuration time.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@924418 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
-rwxr-xr-xqpid/cpp/src/qpid/Version.h (renamed from qpid/cpp/src/qpid/Version.h.in)8
1 files changed, 2 insertions, 6 deletions
diff --git a/qpid/cpp/src/qpid/Version.h.in b/qpid/cpp/src/qpid/Version.h
index b85935a756..b4805a3757 100755
--- a/qpid/cpp/src/qpid/Version.h.in
+++ b/qpid/cpp/src/qpid/Version.h
@@ -23,10 +23,11 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
+#else
+# error "config.h not generated"
#endif
namespace qpid {
-#ifdef HAVE_CONFIG_H
const std::string product = PACKAGE_NAME;
const std::string version = PACKAGE_VERSION;
# if HAVE_SASL
@@ -34,11 +35,6 @@ namespace qpid {
# else
const std::string saslName = "qpidd-no-sasl";
# endif
-#else
- const std::string product = "qpidc";
- const std::string version = "@VERSION@";
- const std::string saslName = "qpid-broker";
-#endif
}
#endif /*!QPID_VERSION_H*/