aboutsummaryrefslogtreecommitdiffstats
path: root/erts/configure.in
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2011-03-21 11:02:44 +0100
committerPatrik Nyblom <[email protected]>2011-03-21 11:05:09 +0100
commitff6a741679c092312f282bf7db555f238c1e963a (patch)
tree025f987e5f83c5c7e33d5c4e3e45d13ac414383e /erts/configure.in
parent91b2e57ea0e3ab794d4b57a12ef10205383525a5 (diff)
downloadotp-ff6a741679c092312f282bf7db555f238c1e963a.tar.gz
otp-ff6a741679c092312f282bf7db555f238c1e963a.tar.bz2
otp-ff6a741679c092312f282bf7db555f238c1e963a.zip
Make Erlang build with Latest MS SDK, 7.1 (and VStudio 2010)
Diffstat (limited to 'erts/configure.in')
-rw-r--r--erts/configure.in8
1 files changed, 7 insertions, 1 deletions
diff --git a/erts/configure.in b/erts/configure.in
index 627f734409..a4c3ffb5c4 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. -*-m4-*-
dnl %CopyrightBegin%
dnl
-dnl Copyright Ericsson AB 1997-2010. All Rights Reserved.
+dnl Copyright Ericsson AB 1997-2011. All Rights Reserved.
dnl
dnl The contents of this file are subject to the Erlang Public License,
dnl Version 1.1, (the "License"); you may not use this file except in
@@ -3660,6 +3660,12 @@ case "$erl_xcomp_without_sysroot-$with_ssl" in
urp="uninstall/openssl_is1/inno setup: app path"
rp="$wrp$urp"
if regtool -q get "$rp" > /dev/null; then
+ true
+ else
+ urp="uninstall/openssl (32-bit)_is1/inno setup: app path"
+ rp="$wrp$urp"
+ fi
+ if regtool -q get "$rp" > /dev/null; then
ssl_install_dir=`regtool -q get "$rp"`
# Try hard to get rid of spaces...
if cygpath -d "$ssl_install_dir" > /dev/null 2>&1; then