summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorume <ume@FreeBSD.org>2003-04-16 17:28:05 +0000
committerume <ume@FreeBSD.org>2003-04-16 17:28:05 +0000
commit912d339de69f5a5ecb3dbb1fc96cb6741a95aa39 (patch)
tree92d1a84e4fab1cb220c95f6e3749eaaa3334049b /security
parent14cb94532118aa1b34fe913c3cfc849ad25c4e2b (diff)
downloadFreeBSD-ports-912d339de69f5a5ecb3dbb1fc96cb6741a95aa39.zip
FreeBSD-ports-912d339de69f5a5ecb3dbb1fc96cb6741a95aa39.tar.gz
make configure script pickking up the Heimdal Kerberos that's
in FreeBSD's base. Submitted by: Graeme Mathieson <mathie@wossname.org.uk>
Diffstat (limited to 'security')
-rw-r--r--security/cyrus-sasl2/files/patch-configure18
-rw-r--r--security/cyrus-sasl2/files/patch-saslauthd::configure18
2 files changed, 36 insertions, 0 deletions
diff --git a/security/cyrus-sasl2/files/patch-configure b/security/cyrus-sasl2/files/patch-configure
index f190531..e55fc8c 100644
--- a/security/cyrus-sasl2/files/patch-configure
+++ b/security/cyrus-sasl2/files/patch-configure
@@ -18,3 +18,21 @@
do
echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6
echo "configure:3050: checking for db_create in -l$dbname" >&5
+@@ -5456,7 +5456,7 @@
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_save_LIBS="$LIBS"
+-LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} -lcom_err $LIBS"
++LIBS="$GSSAPIBASE_LIBS `krb5-config --libs gssapi` $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 5462 "configure"
+ #include "confdefs.h"
+@@ -5494,7 +5494,7 @@
+ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
+ GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
+ elif test "$gss_impl" = "heimdal"; then
+- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} -lcom_err"
++ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS `krb5-config --libs gssapi`"
+ GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
+ else
+ gssapi="no"
diff --git a/security/cyrus-sasl2/files/patch-saslauthd::configure b/security/cyrus-sasl2/files/patch-saslauthd::configure
index 0671a54..a59ce6b 100644
--- a/security/cyrus-sasl2/files/patch-saslauthd::configure
+++ b/security/cyrus-sasl2/files/patch-saslauthd::configure
@@ -1,5 +1,23 @@
--- saslauthd/configure.orig Mon Apr 14 20:07:50 2003
+++ saslauthd/configure Tue Apr 15 01:39:33 2003
+@@ -2988,7 +2988,7 @@
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_save_LIBS="$LIBS"
+-LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} -lcom_err $LIBS"
++LIBS="$GSSAPIBASE_LIBS `krb5-config --libs gssapi` $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 2994 "configure"
+ #include "confdefs.h"
+@@ -3026,7 +3026,7 @@
+ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
+ GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
+ elif test "$gss_impl" = "heimdal"; then
+- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} -lcom_err"
++ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS `krb5-config --libs gssapi`"
+ GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
+ else
+ gssapi="no"
@@ -3441,7 +3441,7 @@
BDB_LIBADD=""
fi
OpenPOWER on IntegriCloud