From eefde42da7da15b305a56b443c166bfd96ba7432 Mon Sep 17 00:00:00 2001 From: Eduardo Chappa Date: Tue, 27 Dec 2016 20:55:29 -0700 Subject: * crypto.h is installed in /usr/include in cygwin, but everyone else installs it in /usr/include/openssl. Also other systems seem to install crypto.h when they install openssl, so we only check for the existence of crypto.h in Cygwin. --- configure.ac | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 174ca894..8dfd5fac 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ dnl */ AC_PREREQ([2.69]) -AC_REVISION([Rev:20 by chappa@washington.edu]) +AC_REVISION([Rev:21 by chappa@washington.edu]) dnl Alpine Version Number is in $srcdir/VERSION AC_INIT([alpine],[m4_normalize(m4_include(VERSION))],[chappa@washington.edu]) @@ -134,6 +134,7 @@ case $host in localedir="\${datadir}/locale" ;; esac + AC_ARG_WITH(localedir, AS_HELP_STRING([--with-localedir=DIR],[Name of gettext locale directory]), [ @@ -1458,11 +1459,16 @@ 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 crypto.h NOT found. Install correspoding libcrypt-devel package) - exit 1 - fi + case $host in + *-*-cygwin) + AC_CHECK_HEADER(crypto.h, , [ alpine_CRYPTO_DEVEL="none" ]) + if test "x$alpine_CRYPTO_DEVEL" = "xnone" ; then + AC_MSG_ERROR(crypto library file crypto.h NOT found. Install correspoding libcrypt-devel package) + exit 1 + fi + ;; + *) ;; + esac fi if test "x$alpine_SSLTYPE" != "xnone" ; then -- cgit v1.2.3-54-g00ecf