diff options
| author | Hajimu UMEMOTO <ume@FreeBSD.org> | 2004-01-17 15:35:34 +0000 |
|---|---|---|
| committer | Hajimu UMEMOTO <ume@FreeBSD.org> | 2004-01-17 15:35:34 +0000 |
| commit | 153d604e2408e7fa68470a7f312a04c7c8ab76d5 (patch) | |
| tree | b9c0e097adaa0f1aeb139abc3d0c6f8e55068060 /mail/cyrus-imapd23/files | |
| parent | Upgrade to 2.661. (diff) | |
Support Berkeley DB 4.2.
Since our db42 requires to include db.h to use. existing configure
script cannot detect our db42. AC_CHECK_LIB() simply test if a
function exists. :(
Requested by: Dmitry Sorokin <dmitry_sorokin@yahoo.ca>
Notes
Notes:
svn path=/head/; revision=98399
Diffstat (limited to 'mail/cyrus-imapd23/files')
| -rw-r--r-- | mail/cyrus-imapd23/files/extra-patch-aclocal.m4 | 15 | ||||
| -rw-r--r-- | mail/cyrus-imapd23/files/patch-ac | 16 |
2 files changed, 27 insertions, 4 deletions
diff --git a/mail/cyrus-imapd23/files/extra-patch-aclocal.m4 b/mail/cyrus-imapd23/files/extra-patch-aclocal.m4 index f8b4d889dc4a..1ecdc62288cd 100644 --- a/mail/cyrus-imapd23/files/extra-patch-aclocal.m4 +++ b/mail/cyrus-imapd23/files/extra-patch-aclocal.m4 @@ -1,7 +1,7 @@ Index: aclocal.m4 diff -u aclocal.m4.orig aclocal.m4 ---- aclocal.m4.orig Wed Oct 29 02:24:46 2003 -+++ aclocal.m4 Wed Oct 29 04:28:37 2003 +--- aclocal.m4.orig Thu Jan 15 23:36:46 2004 ++++ aclocal.m4 Sat Jan 17 22:58:54 2004 @@ -505,7 +505,7 @@ BDB_LIBADD="" fi @@ -11,7 +11,16 @@ diff -u aclocal.m4.orig aclocal.m4 do AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; break, dblib="no") -@@ -1664,7 +1664,7 @@ +@@ -547,7 +547,7 @@ + dnl Note that FreeBSD puts it in a wierd place + dnl (but they should use with-bdb-incdir) + AC_CHECK_HEADER(db.h, +- CYRUS_BERKELEY_DB_CHK_LIB(), ++ BDB_LIBADD="$BDB_LIBADD -l$with_bdb"; dblib="berkeley", + dblib="no") + + CPPFLAGS=$cmu_save_CPPFLAGS +@@ -1786,7 +1786,7 @@ LIB_UCDSNMP="" if test "$with_ucdsnmp" != no; then AC_DEFINE(HAVE_UCDSNMP,1,[Do we have SNMP support?]) diff --git a/mail/cyrus-imapd23/files/patch-ac b/mail/cyrus-imapd23/files/patch-ac index 2088891edc95..17f80a114033 100644 --- a/mail/cyrus-imapd23/files/patch-ac +++ b/mail/cyrus-imapd23/files/patch-ac @@ -1,7 +1,7 @@ Index: configure diff -u configure.orig configure --- configure.orig Thu Jan 15 23:36:50 2004 -+++ configure Fri Jan 16 04:03:09 2004 ++++ configure Sat Jan 17 21:11:14 2004 @@ -6565,7 +6565,7 @@ BDB_LIBADD="" fi @@ -11,6 +11,20 @@ diff -u configure.orig configure do as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_create" | $as_tr_sh` echo "$as_me:$LINENO: checking for db_create in -l$dbname" >&5 +@@ -6589,11 +6589,11 @@ + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char db_create (); ++#include <db.h> + int + main () + { +-db_create (); ++db_create (0, 0, 0); + ; + return 0; + } @@ -13854,7 +13854,7 @@ #define HAVE_UCDSNMP 1 _ACEOF |