summaryrefslogtreecommitdiff
path: root/security/cyrus-sasl/files/patch-ab
diff options
context:
space:
mode:
authorYing-Chieh Liao <ijliao@FreeBSD.org>2002-06-18 06:16:47 +0000
committerYing-Chieh Liao <ijliao@FreeBSD.org>2002-06-18 06:16:47 +0000
commitcbe827fe7c683a8b8687bbe9b2e12d80208e4343 (patch)
tree40caa3b7912e46dad80ea67827d3d441bc17409c /security/cyrus-sasl/files/patch-ab
parentFix variable (diff)
fix configure on -current
update Sendmail.README for sendmail 8.10-8.12 PR: 38646 Submitted by: maintainer
Notes
Notes: svn path=/head/; revision=61477
Diffstat (limited to '')
-rw-r--r--security/cyrus-sasl/files/patch-ab21
1 files changed, 12 insertions, 9 deletions
diff --git a/security/cyrus-sasl/files/patch-ab b/security/cyrus-sasl/files/patch-ab
index 323190966e63..4b1a2c357e00 100644
--- a/security/cyrus-sasl/files/patch-ab
+++ b/security/cyrus-sasl/files/patch-ab
@@ -1,18 +1,21 @@
---- configure.in.orig Mon May 20 19:02:49 2002
-+++ configure.in Mon May 20 19:21:53 2002
-@@ -66,8 +66,9 @@
+--- configure.in.orig Wed May 22 20:49:46 2002
++++ configure.in Thu May 23 16:52:07 2002
+@@ -66,8 +66,12 @@
dnl check for -R, etc. switch
CMU_GUESS_RUNPATH_SWITCH
dnl let's just link against local. otherwise we never find anything useful.
-CPPFLAGS="-I/usr/local/include ${CPPFLAGS}"
-CMU_ADD_LIBPATH("/usr/local/lib")
-+CPPFLAGS="-I${OPENSSLINC} -I${OPENSSLINC}/openssl ${CPPFLAGS}"
++CPPFLAGS="-I${OPENSSLINC}/openssl ${CPPFLAGS}"
++if test "${OPENSSLINC}" != "/usr/include" ; then
++ CPPFLAGS="-I${OPENSSLINC} ${CPPFLAGS}"
++fi
+CMU_ADD_LIBPATH("${OPENSSLLIB}")
+CMU_ADD_LIBPATH("${LOCALBASE}/lib")
AM_DISABLE_STATIC
-@@ -122,8 +123,6 @@
+@@ -122,8 +126,6 @@
AC_SUBST(JAVA_INCLUDES)
AC_MSG_RESULT(JAVA_INCLUDES)
@@ -21,7 +24,7 @@
fi
AM_CONDITIONAL(SAMPLE, test "$enable_sample" = yes)
-@@ -149,11 +148,13 @@
+@@ -149,11 +151,13 @@
AC_CHECK_HEADER(db.h,
AC_CHECK_LIB(db-3, db_create, SASL_DB_LIB="-ldb-3";
dblib="berkeley",
@@ -36,7 +39,7 @@
dblib="no")
;;
gdbm)
-@@ -175,11 +176,13 @@
+@@ -175,11 +179,13 @@
AC_CHECK_HEADER(db.h,
AC_CHECK_LIB(db-3, db_create, SASL_DB_LIB="-ldb-3";
dblib="berkeley",
@@ -51,7 +54,7 @@
dblib="no")
if test "$dblib" = no; then
dnl How about ndbm?
-@@ -229,6 +232,13 @@
+@@ -229,6 +235,13 @@
berkeley)
SASL_DB_BACKEND="db_${dblib}.lo"
AC_DEFINE(SASL_BERKELEYDB)
@@ -65,7 +68,7 @@
;;
*)
AC_MSG_WARN([Disabling SASL authentication database support])
-@@ -534,12 +544,16 @@
+@@ -534,12 +547,16 @@
fi
if test "$with_des" != no; then