Reverted the LIBCURL_VERSION_NUM change from October 6. As Dave Dribin

reported, the define is used by the configure script and is assumed to use
the 0xYYXXZZ format. This made "curl-config --vernum" fail in the 7.15.0
release version.

diff --git a/CHANGES b/CHANGES
index 8d2017e5c49557747d405eab396d9dc228ae8dc0..ccfac04a97992c1e7dcb481f8df75c1311410788 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,12 @@
 
 
 
+Daniel (14 October 2005)
+- Reverted the LIBCURL_VERSION_NUM change from October 6. As Dave Dribin
+  reported, the define is used by the configure script and is assumed to use
+  the 0xYYXXZZ format. This made "curl-config --vernum" fail in the 7.15.0
+  release version.
+
 Version 7.15.0 (13 October 2005)
 
 Daniel (12 October 2005)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c458a948fe5b7c2e4aac225e6da0805321085a78..ddfc40035aecf1242edc37757b960bd3bbb1bef4 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -15,7 +15,7 @@ This release includes the following changes:
 
 This release includes the following bugfixes:
 
- o 
+ o curl-config --vernum fixed
 
 Other curl-related news since the previous public release:
 
@@ -24,6 +24,6 @@ Other curl-related news since the previous public release:
 This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
- o 
+ Dave Dribin
 
         Thanks! (and sorry if I forgot to mention someone)

diff --git a/include/curl/curlver.h b/include/curl/curlver.h
index 0cb6c2337e5f927977518f81c57bc557a6513301..7f94670f44fa09b352dd61bf651572fbb4a461f4 100644 (file)
--- a/include/curl/curlver.h
+++ b/include/curl/curlver.h
@@ -51,8 +51,6 @@
    and it is always a greater number in a more recent release. It makes
    comparisons with greater than and less than work.
 */
-#define LIBCURL_VERSION_NUM ((LIBCURL_VERSION_MAJOR << 16) | \
-                             (LIBCURL_VERSION_MINOR << 8) | \
-                             LIBCURL_VERSION_PATCH)
+#define LIBCURL_VERSION_NUM 0x070f01
 
 #endif /* __CURL_CURLVER_H */

diff --git a/maketgz b/maketgz
index 91ac4c4443e57d9fa3172011875578d3b50baff3..4941f8833422390550e0dfccba835d28398c223d 100755 (executable)
--- a/maketgz
+++ b/maketgz
@@ -25,6 +25,7 @@ CHEADER=src/version.h
 
 # Replace version number in header file:
 sed -e 's/^#define LIBCURL_VERSION .*/#define LIBCURL_VERSION "'$libversion'"/g' \
+    -e 's/^#define LIBCURL_VERSION_NUM .*/#define LIBCURL_VERSION_NUM 0x'$numeric'/g' \
     -e 's/^#define LIBCURL_VERSION_MAJOR .*/#define LIBCURL_VERSION_MAJOR '$major'/g' \
     -e 's/^#define LIBCURL_VERSION_MINOR .*/#define LIBCURL_VERSION_MINOR '$minor'/g' \
     -e 's/^#define LIBCURL_VERSION_PATCH .*/#define LIBCURL_VERSION_PATCH '$patch'/g' \