From bc528fc212eb761ce04aeea81252083d42ebb811 Mon Sep 17 00:00:00 2001
From: Tom Yu <tlyu@mit.edu>
Date: Wed, 18 Apr 2007 22:16:39 +0000
Subject: [PATCH] pull up r19469 from trunk

 r19469@cathode-dark-space:  kpkoch | 2007-04-13 18:29:58 -0400
 Target_Version: 1.6.1
 Ticket: 5521
 Tags: pullup

 Implement environment variable settings from the config xml file.  See notes in bkwconfig.xml.

ticket: 5521

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@19502 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/windows/build/BKWconfig.xml | 3 +--
 src/windows/build/bkw.pl        | 7 +++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/windows/build/BKWconfig.xml b/src/windows/build/BKWconfig.xml
index 654396685..b7c11d181 100644
--- a/src/windows/build/BKWconfig.xml
+++ b/src/windows/build/BKWconfig.xml
@@ -2,7 +2,7 @@
 <!-- BKW: Build Kerberos for Windows -->
 <BKW_Config>
     <Config>
-        <!-- All the parameters are specified here.  They can be over-ridden
+        <!-- All the parameters are specified here.  Most can be over-ridden
                 on the command line.
 
             Parameters are grouped into Options, Directories, Repository and Environment.
@@ -46,7 +46,6 @@
         <!-- Environment variables: -->>
         <KH_RELEASE def="1" env="1" value="OFFICIAL" options="OFFICIAL PRERELEASE PRIVATE" />
         <NODEBUG    def="1" env="1" />  <!-- Interacts with /DEBUG -->
-        
         </Config>
     <Stages>
         <FetchSources>
diff --git a/src/windows/build/bkw.pl b/src/windows/build/bkw.pl
index c7ecf0720..6ea7c7f33 100644
--- a/src/windows/build/bkw.pl
+++ b/src/windows/build/bkw.pl
@@ -176,6 +176,13 @@ sub main {
     # Scan the configuration for switch definitions:
     while (($sw, $val) = each %$odr) {
         next if (! exists $val->{def}); ## ?? Should always exist.
+
+        # Set/clear environment variables:
+        if ($val->{env}) {
+            if ($val->{def})    {$ENV{$sw}   = (exists $val->{value}) ? $val->{value} : 1; }
+            else                {delete $ENV{$sw};  }
+            }
+
         # If the switch is in the command line, override the stored value:
         if (exists $OPT->{$sw}) {
             if (exists $val->{value}) {
-- 
2.26.2