--- erts/configure.orig	2004-06-23 15:55:23 +1300
+++ erts/configure	2004-08-30 23:01:07 +1300
@@ -5993,9 +5993,7 @@
 
     echo $ac_n "checking for OpenSSL >= 0.9.7 in standard locations""... $ac_c" 1>&6
 echo "configure:5996: checking for OpenSSL >= 0.9.7 in standard locations" >&5 
-    for dir in $extra_dir /cygdrive/c/OpenSSL /usr/local /usr /usr/pkg \
-		/usr/local/openssl /usr/lib/openssl /usr/openssl \
-		/usr/local/ssl /usr/lib/ssl /usr/ssl
+    for dir in $extra_dir /usr 
 	do
        if test -f $dir/include/openssl/opensslv.h; then
 		is_real_ssl=yes
@@ -6011,9 +6009,9 @@
 				is_real_ssl=no
 			fi
 		else
-			SSL_LIBDIR="$dir/lib"
+			SSL_LIBDIR="/lib"
 		fi
-		SSL_BINDIR="$dir/bin"
+		SSL_BINDIR="/usr/bin"
 		if test -f "$SSL_BINDIR/openssl$EXEEXT"; then
 			if "$SSL_BINDIR/openssl" version > /dev/null 2>&1; then
 				OPENSSL_CMD="$SSL_BINDIR/openssl"
@@ -6024,7 +6022,7 @@
 			is_real_ssl=no
 		fi
 		if test "x$is_real_ssl" = "xyes" ; then
-			SSL_INCLUDE="-I$dir/include"
+			SSL_INCLUDE="-I/usr/include/openssl"
 			old_CPPFLAGS=$CPPFLAGS
 			CPPFLAGS=$SSL_INCLUDE
 			cat > conftest.$ac_ext <<EOF
@@ -6079,10 +6077,10 @@
     if test "x$MIXED_CYGWIN_VC" = "xyes" -a -d "$with_ssl/lib/VC"; then
 	SSL_LIBDIR="$with_ssl/lib/VC"
     else
-	SSL_LIBDIR="$with_ssl/lib"
+	SSL_LIBDIR="/lib"
     fi
-    SSL_INCLUDE="-I$with_ssl/include"
-    OPENSSL_CMD="$with_ssl/bin/openssl"
+    SSL_INCLUDE="-I/usr/include/openssl"
+    OPENSSL_CMD="/usr/bin/openssl"
     SSL_APP=ssl
     CRYPTO_APP=crypto
 fi
@@ -6123,9 +6121,7 @@
     if test "x$ssl_krb5_enabled" = "xyes" ; then
         echo $ac_n "checking for krb5.h in standard locations""... $ac_c" 1>&6
 echo "configure:6126: checking for krb5.h in standard locations" >&5
-	for dir in $extra_dir $SSL_ROOT/include $SSL_ROOT/include/openssl \
-		$SSL_ROOT/include/kerberos /cygdrive/c/kerberos/include \
-		/usr/local/kerberos/include /usr/kerberos/include
+	for dir in /usr/include/krb5
 	do
             if test -f "$dir/krb5.h" ; then
                 SSL_KRB5_INCLUDE="$dir"