From 9e7bb76189f6f3590b1046d403302032062c6c55 Mon Sep 17 00:00:00 2001 From: Kris Kennaway Date: Sun, 27 Feb 2000 06:21:10 +0000 Subject: Fix build. Submitted by: Jim Bloom --- security/stunnel/Makefile | 1 + security/stunnel/files/patch-ac | 55 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 54 insertions(+), 2 deletions(-) (limited to 'security/stunnel') diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile index d57ad3640311..5c0bd4d9f47d 100644 --- a/security/stunnel/Makefile +++ b/security/stunnel/Makefile @@ -22,6 +22,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var/run MAN8= stunnel.8 +CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} cert: @(cd ${WRKSRC}; make cert) diff --git a/security/stunnel/files/patch-ac b/security/stunnel/files/patch-ac index 79b9cb7fc4e4..180b11e87da6 100644 --- a/security/stunnel/files/patch-ac +++ b/security/stunnel/files/patch-ac @@ -1,5 +1,22 @@ -*** configure.orig Mon Feb 14 12:32:38 2000 ---- configure Mon Feb 14 12:33:56 2000 +*** configure.orig Thu Feb 10 06:18:18 2000 +--- configure Fri Feb 25 16:29:14 2000 +*************** +*** 9,15 **** + + # Defaults: + ac_help= +! ac_default_prefix=/usr/local + # Any additions from configure.in: + ac_help="$ac_help + --with-random=FILE read randomness from FILE (default=/dev/urandom)" +--- 9,15 ---- + + # Defaults: + ac_help= +! ac_default_prefix=%%LOCALBASE%% + # Any additions from configure.in: + ac_help="$ac_help + --with-random=FILE read randomness from FILE (default=/dev/urandom)" *************** *** 1051,1064 **** echo "$ac_t""no" 1>&6 @@ -60,3 +77,37 @@ else echo "$ac_t""no" 1>&6 +*************** +*** 1174,1180 **** + + echo $ac_n "checking for SSL directory""... $ac_c" 1>&6 + echo "configure:1177: checking for SSL directory" >&5 +! for dir in ${prefix} /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr; do + ssldir="$dir" + if test -f "$dir/include/openssl/ssl.h"; then + cat >> confdefs.h <<\EOF +--- 1174,1180 ---- + + echo $ac_n "checking for SSL directory""... $ac_c" 1>&6 + echo "configure:1177: checking for SSL directory" >&5 +! for dir in /usr ${prefix} /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local; do + ssldir="$dir" + if test -f "$dir/include/openssl/ssl.h"; then + cat >> confdefs.h <<\EOF +*************** +*** 1199,1205 **** + echo $ac_n "checking for RSAref library""... $ac_c" 1>&6 + echo "configure:1201: checking for RSAref library" >&5 + saved_LIBS="$LIBS" +! LIBS="$saved_LIBS -lRSAglue -lrsaref" + cat > conftest.$ac_ext <&6 + echo "configure:1201: checking for RSAref library" >&5 + saved_LIBS="$LIBS" +! LIBS="$saved_LIBS -lRSAglue -L%%LOCALBASE%%/lib -lrsaref" + cat > conftest.$ac_ext <