From: james <james@e7ae566f-a301-0410-adde-c780ea21d3b5>
Date: Wed, 21 Jan 2009 16:59:41 +0000 (+0000)
Subject: Version 2.1_rc15e
X-Git-Tag: v2.1_rc16~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63c9b4973cf7b3e437ab92b4c8b7cea7c8630932;p=thirdparty%2Fopenvpn.git

Version 2.1_rc15e

Windows installer changes:

* ifdefed out the check Windows version code which is causing
  problems on Windows 7

* don't define SF_SELECTED if it is already defined


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@3855 e7ae566f-a301-0410-adde-c780ea21d3b5
---

diff --git a/install-win32/openvpn.nsi b/install-win32/openvpn.nsi
index c1a171017..10e52912c 100755
--- a/install-win32/openvpn.nsi
+++ b/install-win32/openvpn.nsi
@@ -234,6 +234,7 @@ Function .onInit
 # Delete previous start menu
   RMDir /r $SMPROGRAMS\${PRODUCT_NAME}
 
+!ifdef CHECK_WINDOWS_VERSION
 # Check windows version
   Call GetWindowsVersion
   Pop $1
@@ -263,9 +264,13 @@ vista64bummer:
 
 init32bits:
 
+!endif
+
 FunctionEnd
 
+!ifndef SF_SELECTED
 !define SF_SELECTED 1
+!endif
 
 ;--------------------
 ;Pre-install section
diff --git a/version.m4 b/version.m4
index e0921bf8e..545834328 100644
--- a/version.m4
+++ b/version.m4
@@ -1,5 +1,5 @@
 dnl define the OpenVPN version
-define(PRODUCT_VERSION,[2.1_rc15d])
+define(PRODUCT_VERSION,[2.1_rc15e])
 dnl define the TAP version
 define(PRODUCT_TAP_ID,[tap0901])
 define(PRODUCT_TAP_WIN32_MIN_MAJOR,[9])