fixed version string for dev builds; added check for wanted version.

git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/0.9.x@565562 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 24 insertions, 9 deletions

diff --git a/build/nw_ver.awk b/build/nw_ver.awk
index ae82305a1..7eef25fea 100644
--- a/build/nw_ver.awk
+++ b/build/nw_ver.awk
@@ -10,16 +10,31 @@ BEGIN {
       ver_minor = $3;
     }
     else if (match ($0, /^#define APR_PATCH_VERSION/)) {
-      ver_str_patch = $3;
-      if (match (ver_str_patch, /[0-9][0-9]*/)) {
-         ver_patch = substr(ver_str_patch, RSTART, RLENGTH); 
-      }
+      ver_patch = $3;
+    }
+    else if (match ($0, /^#define APR_IS_DEV_VERSION/)) {
+      ver_devbuild = 1;
     }
   }
-  ver = ver_major "," ver_minor "," ver_patch;
-  ver_str = ver_major "." ver_minor "." ver_str_patch;
-
-  print "VERSION = " ver "";
-  print "VERSION_STR = " ver_str "";
+  ver_str = ver_major "." ver_minor "." ver_patch (ver_devbuild ? "-dev" : "");
+  if (WANTED) {
+    ver_num = ver_major * 1000000 + ver_minor * 1000 + ver_patch;
+    if (ver_num < WANTED) {
+      print "ERROR: APR version " ver_str " does NOT match!";
+      exit 1;
+    } else if (ver_num >= 1000000) {
+      print "ERROR: APR version " ver_str " higher than expected!";
+      exit 1;
+    } else {
+      print "OK: APR version " ver_str "";
+      exit 0;
+    }
+  } else {
+    ver_nlm = ver_major "," ver_minor "," ver_patch;
+    print "VERSION = " ver_nlm "";
+    print "VERSION_STR = " ver_str "";
+  }
 
 }
+
+