diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2016-12-09 23:52:56 -0700 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2016-12-09 23:52:56 -0700 |
| commit | 4638db18b0a2ebc5e631886e7d89218641be819f (patch) | |
| tree | 194afec3e47c087bf8579781ffe9b89dc158f528 | |
| parent | 702c64290612155aec75cac92dbfe8caab0ba196 (diff) | |
| download | alpine-4638db18b0a2ebc5e631886e7d89218641be819f.tar.xz | |
* Add location of openssl libraries, include files, etc for openssl in
manjaro Linux.
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | pith/pine.hlp | 2 |
3 files changed, 17 insertions, 5 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Rev:19 by chappa@washington.edu. +# From configure.ac Rev:20 by chappa@washington.edu. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for alpine 2.20.99. # @@ -17202,6 +17202,12 @@ else alpine_SSLINCLUDE="/usr/include/openssl" alpine_SSLLIB="/usr/lib" fi + elif test -f /etc/manjaro-release ; then + alpine_SSLDIR="/etc/ssl" + alpine_SSLCERTS="$alpine_SSLDIR/certs" + alpine_SSLKEYS="$alpine_SSLDIR/private" + alpine_SSLINCLUDE="/usr/include/openssl" + alpine_SSLLIB="/usr/lib" else alpine_SSLTYPE="nopwd" alpine_SSLDIR="/usr" @@ -18494,7 +18500,7 @@ 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 + as_fn_error $? "crypto library file crypto.h NOT found. Install correspoding libcrypt-devel package" "$LINENO" 5 exit 1 fi fi diff --git a/configure.ac b/configure.ac index d032df7e..174ca894 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ dnl */ AC_PREREQ([2.69]) -AC_REVISION([Rev:19 by chappa@washington.edu]) +AC_REVISION([Rev:20 by chappa@washington.edu]) dnl Alpine Version Number is in $srcdir/VERSION AC_INIT([alpine],[m4_normalize(m4_include(VERSION))],[chappa@washington.edu]) @@ -764,6 +764,12 @@ else alpine_SSLINCLUDE="/usr/include/openssl" alpine_SSLLIB="/usr/lib" fi + elif test -f /etc/manjaro-release ; then + alpine_SSLDIR="/etc/ssl" + alpine_SSLCERTS="$alpine_SSLDIR/certs" + alpine_SSLKEYS="$alpine_SSLDIR/private" + alpine_SSLINCLUDE="/usr/include/openssl" + alpine_SSLLIB="/usr/lib" else alpine_SSLTYPE="nopwd" alpine_SSLDIR="/usr" @@ -1454,7 +1460,7 @@ if test "x$alpine_SSLTYPE" != "xnone" ; then 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) + AC_MSG_ERROR(crypto library file crypto.h NOT found. Install correspoding libcrypt-devel package) exit 1 fi fi diff --git a/pith/pine.hlp b/pith/pine.hlp index c5ecc90a..755a8c51 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 190 2016-12-08 00:45:17 +Alpine Commit 191 2016-12-09 23:51:19 ============= h_news ================= <HTML> <HEAD> |