summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2016-12-27 20:55:29 -0700
committerEduardo Chappa <chappa@washington.edu>2016-12-27 20:55:29 -0700
commiteefde42da7da15b305a56b443c166bfd96ba7432 (patch)
tree26b71938274ce79d1f7ae79a359e7daddcd7f48b
parent054440ecce3a1ea1292cc52f37a84ad21d04cd6d (diff)
downloadalpine-eefde42da7da15b305a56b443c166bfd96ba7432.tar.xz
* 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.
-rwxr-xr-xconfigure18
-rw-r--r--configure.ac18
-rw-r--r--pith/pine.hlp2
3 files changed, 25 insertions, 13 deletions
diff --git a/configure b/configure
index 19f46d7d..1c4cc972 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Rev:20 by chappa@washington.edu.
+# From configure.ac Rev:21 by chappa@washington.edu.
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for alpine 2.20.999.
#
@@ -15107,6 +15107,7 @@ case $host in
;;
esac
+
# Check whether --with-localedir was given.
if test "${with_localedir+set}" = set; then :
withval=$with_localedir;
@@ -18491,7 +18492,9 @@ 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"
+ case $host in
+ *-*-cygwin)
+ 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
@@ -18499,10 +18502,13 @@ else
fi
- if test "x$alpine_CRYPTO_DEVEL" = "xnone" ; then
- as_fn_error $? "crypto library file crypto.h NOT found. Install correspoding libcrypt-devel package" "$LINENO" 5
- exit 1
- fi
+ if test "x$alpine_CRYPTO_DEVEL" = "xnone" ; then
+ as_fn_error $? "crypto library file crypto.h NOT found. Install correspoding libcrypt-devel package" "$LINENO" 5
+ exit 1
+ fi
+ ;;
+ *) ;;
+ esac
fi
if test "x$alpine_SSLTYPE" != "xnone" ; then
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
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 3ff77947..da19da4d 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 200 2016-12-27 11:09:52
+Alpine Commit 201 2016-12-27 20:55:21
============= h_news =================
<HTML>
<HEAD>