projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
md5, sha1, sha256, sha512: add 'auto', and a way to specify default
[gnulib.git]
/
m4
/
gl-openssl.m4
diff --git
a/m4/gl-openssl.m4
b/m4/gl-openssl.m4
index
85bf85f
..
a14408d
100644
(file)
--- 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,
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],
[
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:
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
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],
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])
if test "x$LIB_CRYPTO" = x; then
if test "x$with_openssl" = xyes; then
AC_MSG_ERROR([openssl development library not found for $1])
- el
se
+ el
if test "x$with_openssl" = xoptional; then
AC_MSG_WARN([openssl development library not found for $1])
fi
fi
AC_MSG_WARN([openssl development library not found for $1])
fi
fi