From 707ba1c7b83750d174f5455990ea0a06e86daa79 Mon Sep 17 00:00:00 2001
From: Andrew Stitcher <astitcher@apache.org>
Date: Wed, 17 Mar 2010 18:49:56 +0000
Subject: Fixed previous broken change which attempted to get version at
 configuration time.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@924418 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qpid/Version.h    | 40 ++++++++++++++++++++++++++++++++++++++++
 cpp/src/qpid/Version.h.in | 44 --------------------------------------------
 2 files changed, 40 insertions(+), 44 deletions(-)
 create mode 100755 cpp/src/qpid/Version.h
 delete mode 100755 cpp/src/qpid/Version.h.in

(limited to 'cpp/src')

diff --git a/cpp/src/qpid/Version.h b/cpp/src/qpid/Version.h
new file mode 100755
index 0000000000..b4805a3757
--- /dev/null
+++ b/cpp/src/qpid/Version.h
@@ -0,0 +1,40 @@
+#ifndef QPID_VERSION_H
+#define QPID_VERSION_H
+
+/*
+ *
+ * Copyright (c) 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <string>
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#else
+#  error "config.h not generated"
+#endif
+
+namespace qpid {
+  const std::string product  = PACKAGE_NAME;
+  const std::string version  = PACKAGE_VERSION;
+#  if HAVE_SASL
+  const std::string saslName = BROKER_SASL_NAME;
+#  else
+  const std::string saslName = "qpidd-no-sasl";
+#  endif
+}
+
+#endif  /*!QPID_VERSION_H*/
diff --git a/cpp/src/qpid/Version.h.in b/cpp/src/qpid/Version.h.in
deleted file mode 100755
index b85935a756..0000000000
--- a/cpp/src/qpid/Version.h.in
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef QPID_VERSION_H
-#define QPID_VERSION_H
-
-/*
- *
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <string>
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-namespace qpid {
-#ifdef HAVE_CONFIG_H
-  const std::string product  = PACKAGE_NAME;
-  const std::string version  = PACKAGE_VERSION;
-#  if HAVE_SASL
-  const std::string saslName = BROKER_SASL_NAME;
-#  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*/
-- 
cgit v1.2.1