summaryrefslogtreecommitdiff
path: root/net/samba/patches/patch-ab
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-05-22 21:49:28 +0000
committerjlam <jlam@pkgsrc.org>2001-05-22 21:49:28 +0000
commit655520be9deaa279d6606cb65aefad73ef979b9b (patch)
tree4e2d93e01a897046131e0ae61afa20f567937a3d /net/samba/patches/patch-ab
parent49f7bf5a5ca78093fb8ab887092abc737dea52e4 (diff)
downloadpkgsrc-655520be9deaa279d6606cb65aefad73ef979b9b.tar.gz
Use devel/readline/Makefile.readline for GNU readline support and note why
GNU readline is required. Clean up how to pass location of OpenSSL headers to the configure script.
Diffstat (limited to 'net/samba/patches/patch-ab')
-rw-r--r--net/samba/patches/patch-ab26
1 files changed, 24 insertions, 2 deletions
diff --git a/net/samba/patches/patch-ab b/net/samba/patches/patch-ab
index ae64e98a3e8..51c4d36e593 100644
--- a/net/samba/patches/patch-ab
+++ b/net/samba/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.10 2001/05/14 18:56:17 jlam Exp $
+$NetBSD: patch-ab,v 1.11 2001/05/22 21:49:29 jlam Exp $
--- configure.orig Tue Apr 17 01:44:24 2001
-+++ configure
++++ configure Tue May 22 16:07:36 2001
@@ -40,6 +40,9 @@
--with-readline[=DIR] Look for readline include/libs in DIR
--without-readline Don't include readline support"
@@ -152,3 +152,25 @@ $NetBSD: patch-ab,v 1.10 2001/05/14 18:56:17 jlam Exp $
# Check whether --with-smbwrapper or --without-smbwrapper was given.
if test "${with_smbwrapper+set}" = set; then
withval="$with_smbwrapper"
+@@ -11427,6 +11449,9 @@
+ LIBS="-lssl -lcrypto $LIBS"
+ LDFLAGS="=L/usr/local/ssl/lib $LDFLAGS"
+ ;;
++ /usr)
++ LIBS="-lssl -lcrypto $LIBS"
++ ;;
+ * )
+ CFLAGS="-I${withval}/include $CFLAGS"
+ LIBS="-lssl -lcrypto $LIBS"
+@@ -11441,11 +11466,6 @@
+ LDFLAGS="-L/usr/local/ssl/lib $LDFLAGS"
+
+ fi
+-
+- if test ! -d ${withval}; then
+- echo "configure: error: called with --with-ssl, but ssl base directory ${withval} does not exist or is not a directory. Aborting config" 1>&2
+- exit 1
+- fi
+
+ CFLAGS="-DHAVE_CRYPT_DECL $CFLAGS" # Damn, SSLeay defines its own
+