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 c1a171017b32191a8a7bb44e14371529632c8175..10e52912c79224587b677cb5dad1c4a36d6efa1a 100755 (executable)
--- 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 e0921bf8ed8bc379c48c2dc175523e895bca6e7e..54583432834c093e83a33bab9cf45e55966ccc27 100644 (file)
--- 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])