summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2016-08-26 16:31:10 -0600
committerEduardo Chappa <chappa@washington.edu>2016-08-26 16:31:10 -0600
commit0556fa1fb3098640340b10ebe045600531336581 (patch)
treeba5e996cb0bf78bd651d9241c1c98903961a6940
parent77df61fa95f641b7e8124caa802dd8011e5c5567 (diff)
downloadalpine-0556fa1fb3098640340b10ebe045600531336581.tar.xz
* Add improvements to the Solaris port to find openssl files and compile
without problems.
-rwxr-xr-xconfigure5
-rw-r--r--configure.ac5
-rw-r--r--pith/pine.hlp2
3 files changed, 9 insertions, 3 deletions
diff --git a/configure b/configure
index c9a7baa5..07a7388f 100755
--- a/configure
+++ b/configure
@@ -17289,7 +17289,9 @@ else
alpine_SSLDIR="/usr/local/ssl"
;;
*-*-solaris*)
- if test -d /usr/sfw/include/openssl ; then
+ if test -d /usr/include/openssl ; then
+ alpine_SSLINCLUDE="/usr/include/openssl"
+ elif test -d /usr/sfw/include/openssl ; then
alpine_SSLDIR="/usr/sfw"
elif test -d /opt/csw/include/openssl ; then
alpine_SSLDIR="/opt/csw"
@@ -17730,6 +17732,7 @@ fi
if test x$GCC = "xyes" ; then
systype="GSO"
alpine_c_client_target="gso"
+ CFLAGS="$CFLAGS -D__USE_LEGACY_PROTOTYPES__"
else
systype="SOC"
alpine_c_client_target="soc"
diff --git a/configure.ac b/configure.ac
index 2418aaba..94b062d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -854,7 +854,9 @@ dnl find it anywhere else.
alpine_SSLDIR="/usr/local/ssl"
;;
*-*-solaris*)
- if test -d /usr/sfw/include/openssl ; then
+ if test -d /usr/include/openssl ; then
+ alpine_SSLINCLUDE="/usr/include/openssl"
+ elif test -d /usr/sfw/include/openssl ; then
alpine_SSLDIR="/usr/sfw"
elif test -d /opt/csw/include/openssl ; then
alpine_SSLDIR="/opt/csw"
@@ -1154,6 +1156,7 @@ case "$host" in
if test x$GCC = "xyes" ; then
systype="GSO"
alpine_c_client_target="gso"
+ CFLAGS="$CFLAGS -D__USE_LEGACY_PROTOTYPES__"
else
systype="SOC"
alpine_c_client_target="soc"
diff --git a/pith/pine.hlp b/pith/pine.hlp
index bb6df55c..2a7159fd 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 161 2016-08-12 21:18:00
+Alpine Commit 162 2016-08-26 16:30:49
============= h_news =================
<HTML>
<HEAD>