From e1b56927736bd7e8b884668536d0946d8d05d194 Mon Sep 17 00:00:00 2001
From: Francis Dupont <fdupont@isc.org>
Date: Tue, 5 Jan 2016 18:09:55 +0100
Subject: [PATCH] Fixed WIN32 BIND9_CONFIG

---
 win32utils/Configure | 65 ++++++++++++++++++++++++++++----------------
 1 file changed, 42 insertions(+), 23 deletions(-)

diff --git a/win32utils/Configure b/win32utils/Configure
index 31dc1650dc..1bcc6431c4 100644
--- a/win32utils/Configure
+++ b/win32utils/Configure
@@ -382,7 +382,8 @@ my @substdll = ("COMERR_DLL",
 
 my %configvar;
 
-my @substvar = ("BUILD_MACHINE",
+my @substvar = ("BIND9_VERSION",
+                "BUILD_MACHINE",
                 "BUILD_PLATFORM",
                 "COPTI",
                 "COPTML",
@@ -621,6 +622,45 @@ if (($want_win32 eq "yes") && ($want_x64 eq "yes")) {
     $configvar{"BUILD_MACHINE"} = "/machine:X64";
 }
 
+# get the version information
+
+my %Versions;
+
+sub getversion {
+    my $data;
+    my $name;
+    my $value;
+    my $version;
+
+    open V, "..\\version" || die $!;
+    while (<V>) {
+        chomp;
+        ($data) = split(/\#/);
+        if ($data) {
+            ($name, $value) = split(/=/, $data);
+            ($name) = split(/\s+/, $name);
+            if ($name eq 'PRODUCT' || $name eq 'DESCRIPTION') {
+                ($value) =~ s/^["\s]+//;
+                ($value) =~ s/["\s]+$//;
+            } else {
+                ($value) = split(/\s+/, $value);
+            }
+            $Versions{$name} = $value;
+        }
+    }
+    close V;
+
+    $version = "$Versions{'MAJORVER'}.$Versions{'MINORVER'}";
+    if ($Versions{'PATCHVER'} ne "") {
+        $version = "$version.$Versions{'PATCHVER'}";
+    }
+    $version = "$version$Versions{'RELEASETYPE'}$Versions{'RELEASEVER'}";
+    $version = "$version$Versions{'EXTENSIONS'}";
+    $configvar{"BIND9_VERSION"} = "$version";
+}
+
+getversion();
+
 # append seen args to CONFIGARGS define
 
 sub appargs {
@@ -2294,7 +2334,6 @@ sub makeversion {
         "lwres"  => "LIBLWRES_EXPORTS",
         "bind9"  => "LIBBIND9_EXPORTS");
     my @VersionNames = ("LIBINTERFACE", "LIBREVISION", "LIBAGE");
-    my %Versions;
     my $Version;
     my %ApiVersions;
     my $Mapapi;
@@ -2305,26 +2344,6 @@ sub makeversion {
     my $name;
     my $value;
 
-    # First get the version information
-
-    open V, "..\\version" || die $!;
-    while (<V>) {
-        chomp;
-        ($data) = split(/\#/);
-        if ($data) {
-            ($name, $value) = split(/=/, $data);
-            ($name) = split(/\s+/, $name);
-            if ($name eq 'PRODUCT' || $name eq 'DESCRIPTION') {
-                ($value) =~ s/^["\s]+//;
-                ($value) =~ s/["\s]+$//;
-            } else {
-                ($value) = split(/\s+/, $value);
-            }
-            $Versions{$name} = $value;
-        }
-    }
-    close V;
-
     # And the mapapi one
 
     open M, "..\\lib\\dns\\mapapi" || die $!;
@@ -2385,7 +2404,7 @@ sub makeversion {
 ';
 
     $Version = "$Versions{'MAJORVER'}.$Versions{'MINORVER'}";
-    if ($Versions{'PATCHVER'} != "") {
+    if ($Versions{'PATCHVER'} ne "") {
         $Version = "$Version.$Versions{'PATCHVER'}";
     }
     $Version = "$Version$Versions{'RELEASETYPE'}$Versions{'RELEASEVER'}";