2 files changed, 8 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 2d2fa53b8..a03d77e2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
    <tell@telltronics.org>
  - (bal) Patch to force OpenSSH rpm to require the same version of OpenSSL
    that it was compiled against.  Patch by Pekka Savola <pekkas@netcore.fi>
+ - (bal) Double -I for OpenSSL on SCO.  Patch by Tim Rice 
+   <tim@multitalents.net>
 
 20010222                                                             
  - (bal) Corrected SCO luid patch by svaughan <svaughan@asterion.com>
@@ -4104,4 +4106,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.814 2001/02/23 04:55:46 mouring Exp $
+$Id: ChangeLog,v 1.815 2001/02/23 05:05:53 mouring Exp $
diff --git a/configure.in b/configure.in
index 53d036172..5d7283360 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.250 2001/02/21 02:35:37 mouring Exp $
+# $Id: configure.in,v 1.251 2001/02/23 05:05:53 mouring Exp $
 
 AC_INIT(ssh.c)
 
@@ -619,9 +619,9 @@ AC_CACHE_CHECK([for OpenSSL directory], ac_cv_openssldir, [
                         # Try to use $ssldir/include if it exists, otherwise 
                         # $ssldir
                         if test -d "$ssldir/include" ; then
-                                CPPFLAGS="$CPPFLAGS -I$ssldir/include"
+                                CPPFLAGS="$saved_CPPFLAGS -I$ssldir/include"
                         else
-                                CPPFLAGS="$CPPFLAGS -I$ssldir"
+                                CPPFLAGS="$saved_CPPFLAGS -I$ssldir"
                         fi
                 fi
 
@@ -681,9 +681,9 @@ if (test ! -z "$ac_cv_openssldir" && test "x$ac_cv_openssldir" != "x(system)") ;
                 # Try to use $ssldir/include if it exists, otherwise 
                 # $ssldir
                 if test -d "$ssldir/include" ; then
-                        CPPFLAGS="$CPPFLAGS -I$ssldir/include"
+                        CPPFLAGS="$saved_CPPFLAGS -I$ssldir/include"
                 else
-                        CPPFLAGS="$CPPFLAGS -I$ssldir"
+                        CPPFLAGS="$saved_CPPFLAGS -I$ssldir"
                 fi
         fi
 fi