diff options
| author | David W. Chapman Jr. <dwcjr@FreeBSD.org> | 2002-05-21 15:08:58 +0000 |
|---|---|---|
| committer | David W. Chapman Jr. <dwcjr@FreeBSD.org> | 2002-05-21 15:08:58 +0000 |
| commit | fe250dd90dc1984ad9237d03ca7f429d01410340 (patch) | |
| tree | 980724e92edc110533c9d1b3714720872f9416e8 /security/cyrus-sasl/files | |
| parent | f3320d0aaca4a92822a88e5cbd2ac3a8ee21513c (diff) | |
Notes
Diffstat (limited to 'security/cyrus-sasl/files')
| -rw-r--r-- | security/cyrus-sasl/files/patch-ab | 58 |
1 files changed, 55 insertions, 3 deletions
diff --git a/security/cyrus-sasl/files/patch-ab b/security/cyrus-sasl/files/patch-ab index 009a8b4a9f82..323190966e63 100644 --- a/security/cyrus-sasl/files/patch-ab +++ b/security/cyrus-sasl/files/patch-ab @@ -1,5 +1,5 @@ ---- configure.in.orig Thu Jan 17 19:21:51 2002 -+++ configure.in Thu Jan 17 19:47:46 2002 +--- configure.in.orig Mon May 20 19:02:49 2002 ++++ configure.in Mon May 20 19:21:53 2002 @@ -66,8 +66,9 @@ dnl check for -R, etc. switch CMU_GUESS_RUNPATH_SWITCH @@ -21,7 +21,37 @@ fi AM_CONDITIONAL(SAMPLE, test "$enable_sample" = yes) -@@ -235,6 +234,13 @@ +@@ -149,11 +148,13 @@ + AC_CHECK_HEADER(db.h, + AC_CHECK_LIB(db-3, db_create, SASL_DB_LIB="-ldb-3"; + dblib="berkeley", ++ AC_CHECK_LIB(db3, db_create, SASL_DB_LIB="-ldb3"; ++ dblib="berkeley", + AC_CHECK_LIB(db, db_create, SASL_DB_LIB="-ldb"; + dblib="berkeley", + AC_CHECK_LIB(db, db_open, SASL_DB_LIB="-ldb"; + dblib="berkeley", +- dblib="no"))), ++ dblib="no")))), + dblib="no") + ;; + gdbm) +@@ -175,11 +176,13 @@ + AC_CHECK_HEADER(db.h, + AC_CHECK_LIB(db-3, db_create, SASL_DB_LIB="-ldb-3"; + dblib="berkeley", ++ AC_CHECK_LIB(db3, db_create, SASL_DB_LIB="-ldb3"; ++ dblib="berkeley", + AC_CHECK_LIB(db, db_create, SASL_DB_LIB="-ldb"; + dblib="berkeley", + AC_CHECK_LIB(db, db_open, SASL_DB_LIB="-ldb"; + dblib="berkeley", +- dblib="no"))), ++ dblib="no")))), + dblib="no") + if test "$dblib" = no; then + dnl How about ndbm? +@@ -229,6 +232,13 @@ berkeley) SASL_DB_BACKEND="db_${dblib}.lo" AC_DEFINE(SASL_BERKELEYDB) @@ -35,3 +65,25 @@ ;; *) AC_MSG_WARN([Disabling SASL authentication database support]) +@@ -534,12 +544,16 @@ + fi + + if test "$with_des" != no; then ++ case "$host_os" in ++ freebsd*) ++ COM_ERR="-lcom_err" ++ ;; ++ esac + AC_CHECK_HEADER(krb.h, +- AC_CHECK_LIB(krb, krb_mk_priv, COM_ERR="", +- AC_CHECK_LIB(krb, krb_mk_priv, COM_ERR="-lcom_err", +- AC_WARN(No Kerberos V4 found); krb4=no, -ldes -lcom_err), +- -ldes), +- AC_WARN(No Kerberos V4 found); krb4=no) ++ AC_CHECK_LIB(krb, krb_mk_priv,:, ++ AC_WARN(No Kerberos V4 found); krb4=no, ++ -ldes ${COM_ERR}), ++ AC_WARN(No Kerberos V4 headers found); krb4=no) + else + AC_WARN(No DES library found for Kerberos V4 support) + krb4=no |