1 files changed, 21 insertions, 1 deletions

diff --git a/src/lib/libssl/src/config b/src/lib/libssl/src/config
index 0715d378d9..c2f504f59e 100644
--- a/src/lib/libssl/src/config
+++ b/src/lib/libssl/src/config
@@ -54,6 +54,22 @@ SYSTEM=`(uname -s) 2>/dev/null`  || SYSTEM="unknown"
 VERSION=`(uname -v) 2>/dev/null` || VERSION="unknown"
 
 
+
+ 
+
+# Check for VC++ presence first.
+#
+#if [ "x$MSVCDIR" != "x" -o "x$VCINSTALLDIR" != "x" ]; then
+#       perl Configure VC-WIN32 $*
+#       cmd /c ms\\do_masm.bat
+#       perl util/mk1mf.pl VC-WIN32-GMAKE >mak.tmp
+#       rm Makefile
+#       mv mak.tmp Makefile
+#       echo "Configured for VC++ using GNU make"
+#       exit 0
+#fi
+#
+
 # Now test for ISC and SCO, since it is has a braindamaged uname.
 #
 # We need to work around FreeBSD 1.1.5.1 
@@ -339,6 +355,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
 
     MINGW*)
         echo "${MACHINE}-whatever-mingw"; echo 0;
+        # Save fipslib path so VC++ build can find it
+        (cd /usr/local/ssl/lib ; pwd -W ) > util/fipslib_path.txt
+        # Extract _chkstk.o so VC++ can use it, to avoid __alloca link error
+        (cd ms ; ar x `gcc -print-libgcc-file-name` _chkstk.o)
         ;;
     CYGWIN*)
         case "$RELEASE" in
@@ -407,7 +427,7 @@ if [ "$GCCVER" != "" ]; then
   CC=gcc
   # then strip off whatever prefix egcs prepends the number with...
   # Hopefully, this will work for any future prefixes as well.
-  GCCVER=`echo $GCCVER | sed 's/^[a-zA-Z]*\-//'`
+  GCCVER=`echo $GCCVER | LC_ALL=C sed 's/^[a-zA-Z]*\-//'`
   # Since gcc 3.1 gcc --version behaviour has changed.  gcc -dumpversion
   # does give us what we want though, so we use that.  We just just the
   # major and minor version numbers.