Don't enable blowfish and MD5 support if the OpenSSL header files
authorTaylor R. Campbell <net/mumble/campbell>
Fri, 1 May 2009 20:04:45 +0000 (20:04 +0000)
committerTaylor R. Campbell <net/mumble/campbell>
Fri, 1 May 2009 20:04:45 +0000 (20:04 +0000)
are unavailable.

v7/src/microcode/configure.ac

index 0f2a857389074dc2a9be70eac6510a03355b11b1..cde298a496b45b909d478d52614cdf4257817757 100644 (file)
@@ -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