diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2016-12-02 21:05:10 -0700 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2016-12-02 21:05:10 -0700 |
| commit | a6d2585047ced0f5c3ae200f0df189fb45ef8763 (patch) | |
| tree | f8e57ac3c899f94210008c9a554de5a65614aebf | |
| parent | 232f7094c81cf3e78918adc5d112cc39d268c784 (diff) | |
| download | alpine-a6d2585047ced0f5c3ae200f0df189fb45ef8763.tar.xz | |
* In Cygwin, installing Openssl does not install libcrypto-devel, so we
add a check for crypt.h to the configure script to check that this
file is properly installed.
| -rwxr-xr-x | configure | 14 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | pith/pine.hlp | 2 |
3 files changed, 20 insertions, 3 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Rev:18 by chappa@washington.edu. +# From configure.ac Rev:19 by chappa@washington.edu. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for alpine 2.20.99. # @@ -18485,6 +18485,18 @@ fi as_fn_error $? "crypto library NOT found" "$LINENO" 5 exit 1 fi + ac_fn_c_check_header_mongrel "$LINENO" "crypto.h" "ac_cv_header_crypto_h" "$ac_includes_default" +if test "x$ac_cv_header_crypto_h" = xyes; then : + +else + alpine_CRYPTO_DEVEL="none" +fi + + + if test "x$alpine_CRYPTO_DEVEL" = "xnone" ; then + as_fn_error $? "crypto library file crypt.h NOT found. Install correspoding licrypt-devel package" "$LINENO" 5 + exit 1 + fi fi if test "x$alpine_SSLTYPE" != "xnone" ; then diff --git a/configure.ac b/configure.ac index fafa819c..d032df7e 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ dnl */ AC_PREREQ([2.69]) -AC_REVISION([Rev:18 by chappa@washington.edu]) +AC_REVISION([Rev:19 by chappa@washington.edu]) dnl Alpine Version Number is in $srcdir/VERSION AC_INIT([alpine],[m4_normalize(m4_include(VERSION))],[chappa@washington.edu]) @@ -1452,6 +1452,11 @@ if test "x$alpine_SSLTYPE" != "xnone" ; then AC_MSG_ERROR(crypto library NOT found) exit 1 fi + AC_CHECK_HEADER(crypto.h, , [ alpine_CRYPTO_DEVEL="none" ]) + if test "x$alpine_CRYPTO_DEVEL" = "xnone" ; then + AC_MSG_ERROR(crypto library file crypt.h NOT found. Install correspoding licrypt-devel package) + exit 1 + fi fi if test "x$alpine_SSLTYPE" != "xnone" ; then diff --git a/pith/pine.hlp b/pith/pine.hlp index 52cdb28b..2adc4e95 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any reasonable place to be called from. Dummy change to get revision in pine.hlp ============= h_revision ================= -Alpine Commit 188 2016-11-26 17:58:22 +Alpine Commit 189 2016-12-02 21:05:05 ============= h_news ================= <HTML> <HEAD> |