From 3386f3988ce2ab14d65f59659d8f95bf4830ecb3 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 7 Dec 2013 17:00:44 -0800 Subject: [PATCH] md5, sha1, sha256, sha512: add 'auto', and a way to specify default * m4/gl-openssl.m4 (gl_CRYPTO_CHECK): Add support for a new option, --with-openssl=auto, which causes the library to be used if available and silently ignored if not. Add support to allow allow configure.ac to specify its own default, by setting with_openssl_default before invoking gl_INIT. --- ChangeLog | 9 +++++++++ m4/gl-openssl.m4 | 17 ++++++++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1f2b13cdb..5d935ad2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2013-12-07 Paul Eggert + + md5, sha1, sha256, sha512: add 'auto', and a way to specify default + * m4/gl-openssl.m4 (gl_CRYPTO_CHECK): + Add support for a new option, --with-openssl=auto, which causes + the library to be used if available and silently ignored if not. + Add support to allow allow configure.ac to specify its own + default, by setting with_openssl_default before invoking gl_INIT. + 2013-12-05 Paul Eggert open-tests: port to glibc with _FORTIFY_SOURCE and -O1 diff --git a/m4/gl-openssl.m4 b/m4/gl-openssl.m4 index 85bf85f8a..a14408dd5 100644 --- a/m4/gl-openssl.m4 +++ b/m4/gl-openssl.m4 @@ -1,4 +1,4 @@ -# gl-openssl.m4 serial 1 +# gl-openssl.m4 serial 2 dnl Copyright (C) 2013 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -6,12 +6,15 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_CRYPTO_CHECK], [ + m4_divert_text([DEFAULTS], [with_openssl_default=no]) + AC_ARG_WITH([openssl], [AS_HELP_STRING([--with-openssl], [use libcrypto hash routines. Valid ARGs are: - 'yes', 'no', 'optional' => use if available])], + 'yes', 'no', 'auto' => use if available, + 'optional' => use if available and warn if not available])], [], - [with_openssl=no]) + [with_openssl=$with_openssl_default]) if test "x$1" = xMD5; then ALG_header=md5.h @@ -24,13 +27,13 @@ AC_DEFUN([gl_CRYPTO_CHECK], if test "x$with_openssl" != xno; then AC_CHECK_LIB([crypto], [$1], [AC_CHECK_HEADERS([openssl/$ALG_header], - [LIB_CRYPTO='-lcrypto' - AC_DEFINE([HAVE_OPENSSL_$1],[1], - [Define to 1 if libcrypto is used for $1])])]) + [LIB_CRYPTO=-lcrypto + AC_DEFINE([HAVE_OPENSSL_$1], [1], + [Define to 1 if libcrypto is used for $1.])])]) if test "x$LIB_CRYPTO" = x; then if test "x$with_openssl" = xyes; then AC_MSG_ERROR([openssl development library not found for $1]) - else + elif test "x$with_openssl" = xoptional; then AC_MSG_WARN([openssl development library not found for $1]) fi fi -- 2.11.0