diff options
| author | Patrik Nyblom <[email protected]> | 2011-03-25 15:00:15 +0100 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2011-03-25 15:00:15 +0100 |
| commit | e230578da9af8ef1cddfed6722d81c998b252476 (patch) | |
| tree | 78bb106251cfb60ed9c5798fcc4136b26ab49837 /erts/configure.in | |
| parent | 21a514ba7842380973fd4c4006d6cf71403d021e (diff) | |
| parent | a06cf2a394a2db854f9b3a7672bd62ab633c0f0b (diff) | |
| download | otp-e230578da9af8ef1cddfed6722d81c998b252476.tar.gz otp-e230578da9af8ef1cddfed6722d81c998b252476.tar.bz2 otp-e230578da9af8ef1cddfed6722d81c998b252476.zip | |
Merge branch 'pan/win_init_restart_oldshell/OTP-9139' into dev
* pan/win_init_restart_oldshell/OTP-9139:
Add testcase
Teach win32/sys.c (fd-driver) not to leak readers causing init:restart to fail
Make Erlang build with Latest MS SDK, 7.1 (and VStudio 2010)
Diffstat (limited to 'erts/configure.in')
| -rw-r--r-- | erts/configure.in | 8 |
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 |