From: Taylor R. Campbell <net/mumble/campbell>
Date: Fri, 1 May 2009 20:04:45 +0000 (+0000)
Subject: Don't enable blowfish and MD5 support if the OpenSSL header files
X-Git-Tag: 20090517-FFI~12
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=8c2f9658dd6da50dcae05cd9312cd4105f3c6b6d;p=mit-scheme.git

Don't enable blowfish and MD5 support if the OpenSSL header files
are unavailable.
---

diff --git a/v7/src/microcode/configure.ac b/v7/src/microcode/configure.ac
index 0f2a85738..cde298a49 100644
--- a/v7/src/microcode/configure.ac
+++ b/v7/src/microcode/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT([MIT/GNU Scheme microcode], [15.1], [bug-mit-scheme@gnu.org], [mit-scheme])
-AC_REVISION([$Id: configure.ac,v 1.66 2009/05/01 17:50:05 riastradh Exp $])
+AC_REVISION([$Id: configure.ac,v 1.67 2009/05/01 20:04:45 riastradh Exp $])
 AC_CONFIG_SRCDIR([boot.c])
 AC_CONFIG_HEADERS([config.h])
 AC_PROG_MAKE_SET
@@ -699,15 +699,17 @@ if test "${with_openssl}" != no; then
 	CPPFLAGS="${CPPFLAGS} -I${with_openssl}/include"
 	LDFLAGS="${LDFLAGS} -L${with_openssl}/lib"
     fi
-    AC_CHECK_HEADERS([openssl/blowfish.h openssl/md5.h])
-    AC_CHECK_LIB([crypto], [BF_set_key],
+    AC_CHECK_HEADERS([openssl/blowfish.h openssl/md5.h],
 	[
-	AC_DEFINE([HAVE_LIBCRYPTO], [1],
-	    [Define to 1 if you have the `crypto' library (-lcrypto).])
-	MODULE_LIBS="-lcrypto ${MODULE_LIBS}"
-	MODULE_BASES="${MODULE_BASES} prbfish prmd5"
-	PRBFISH_LIBS="-lcrypto"
-	PRMD5_LIBS="-lcrypto"
+	AC_CHECK_LIB([crypto], [BF_set_key],
+	    [
+	    AC_DEFINE([HAVE_LIBCRYPTO], [1],
+		[Define to 1 if you have the `crypto' library (-lcrypto).])
+	    MODULE_LIBS="-lcrypto ${MODULE_LIBS}"
+	    MODULE_BASES="${MODULE_BASES} prbfish prmd5"
+	    PRBFISH_LIBS="-lcrypto"
+	    PRMD5_LIBS="-lcrypto"
+	    ])
 	])
 fi