From e8208ae75603fc656e41ae9b8da176f7f576b97e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20K=C3=B6hler?= <andi5.py@gmx.net>
Date: Fri, 27 Apr 2007 16:54:47 +0000
Subject: [PATCH] Update openssl safety net.

* Bark on $OPENSSL_DIR/lib/libcrypto.dll.a (0.9.7)
* Bark if libeay32.dll cannot be found
* Bark if libeay32.dll is found, but not in $OPENSSL_DIR/bin
* Do not care about libs in $WINDIR


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@16002 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 packaging/win32/install.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packaging/win32/install.sh b/packaging/win32/install.sh
index 564471d552..e26b5f750f 100644
--- a/packaging/win32/install.sh
+++ b/packaging/win32/install.sh
@@ -341,8 +341,9 @@ function inst_openssl() {
     if test -f $_OPENSSL_UDIR/unins000.exe ; then
 	die "Wrong version of OpenSSL installed! Run $_OPENSSL_UDIR/unins000.exe and start install.sh again."
     fi
-    if [ -f $WINDIR\\system32\\libssl32.dll -o -f $WINDIR\\system32\\libeay32.dll ] ; then
-	die "You have uninstalled the Win32OpenSSL-0_9_8d version of OpenSSL, but its DLLs libssl32.dll, libeay32.dll, and ssleay32.dll are still existing in $WINDIR\\system32. You have to delete (or rename) them manually. However, if you know these DLLs are needed by some other package, please contact the gnucash authors so that we can adapt this script."
+    # Make sure the files of openssl-0.9.7c-{bin,lib}.zip are really gone!
+    if [ -f $_OPENSSL_UDIR/lib/libcrypto.dll.a ] ; then
+        die "Found old OpenSSL installation in $_OPENSSL_UDIR.  Please remove that first."
     fi
 
     if quiet ${LD} -L$_OPENSSL_UDIR/lib -leay32 -lssl32 -o $TMP_UDIR/ofile ; then
@@ -373,6 +374,13 @@ function inst_openssl() {
         qpopd
         quiet ${LD} -L$_OPENSSL_UDIR/lib -leay32 -lssl32 -o $TMP_UDIR/ofile || die "openssl not installed correctly"
     fi
+    _eay32dll=$(echo $(which libeay32.dll))  # which sucks
+    if [ -z "$_eay32dll" ] ; then
+        die "Did not find libeay32.dll in your PATH, why that?"
+    fi
+    if [ "$_eay32dll" != "$_OPENSSL_UDIR/bin/libeay32.dll" ] ; then
+        die "Found $_eay32dll in PATH.  If you have added $_OPENSSL_UDIR/bin to your PATH before, make sure it is listed before paths from other packages shipping SSL libraries, like SVN.  In particular, check $_MINGW_UDIR/etc/profile.d/installer.sh."
+    fi
 }
 
 function inst_mingwutils() {