Fixes for old Scientific/RHEL

configure.ac

@@ -659,23 +659,16 @@ if test -n "$WITH_OPENSSL"; then
   AC_CACHE_VAL(sc_cv_have_openssl_ssl_h,
     [AC_TRY_COMPILE([#include <openssl/ssl.h>],[;],
       [sc_cv_have_openssl_ssl_h=yes; OPENSSL_BASE=""; ],
-      [sc_cv_have_openssl_ssl_h=no
-       if test "$OPENSSL_BASE"; then
-	  Ds="$OPENSSL_BASE"
-       else
-          Ds="/sw /usr/local /opt/freeware /usr/sfw /usr/local/ssl"
-       fi
-       for D in $Ds; do
-	I="$D/include"
-	i="$I/openssl/ssl.h"
-	if test -r "$i"; then
-	  #V_INCL="$V_INCL -I$I"
-	  CPPFLAGS="$CPPFLAGS -I$I"
-	  AC_MSG_NOTICE(found $i)
-	  sc_cv_have_openssl_ssl_h=yes; OPENSSL_BASE="$D"
-	  break;
-	fi
-      done])
+      [
+        # Another attempt to compile with OPENSSL_NO_KRB5
+	AC_MSG_NOTICE(trying with -DOPENSSL_NO_KRB5)
+	CFLAGS_ORIG="$CFLAGS"
+	CFLAGS="$CFLAGS -DOPENSSL_NO_KRB5"
+	AC_TRY_COMPILE([#include <openssl/ssl.h>],[;],
+	  [sc_cv_have_openssl_ssl_h=yes],
+	  [sc_cv_have_openssl_ssl_h=no
+	   CFLAGS="$CFLAGS_ORIG"])
+    ])
   ])
   if test "$sc_cv_have_openssl_ssl_h" = "yes"; then
     AC_DEFINE(HAVE_OPENSSL_SSL_H)
@@ -2310,7 +2303,7 @@ int allow_severity,deny_severity;],[hosts_access(0)],
 	AC_TRY_LINK([#include <sys/types.h>
 #include <tcpd.h>
 int allow_severity,deny_severity;],[hosts_access(0)],
-      	  [sc_cv_have_libwrap='yes'],
+	  [sc_cv_have_libwrap='yes'],
 	  [sc_cv_have_libwrap='no'])
       ]
       )