[milters] Archive

Lists Index Date Thread Search

Article: 542
From: Mike
Date: 2005-05-03 10:03:35 -0400
Subject: Re: Problem compiling libsnert & milter-sender on SuSE 9.3 (db related) - diffs

Removal...........: milters-request@milter.info?subject=remove
More information..: http://www.milter.info/#Support
--------------------------------------------------------

It seems the mailinglist does not accept attachments, so here are the inline diffs:

diff -ruN com.orig/snert/include/com/snert/lib/mail/smdb.h
com/snert/include/com/snert/lib/mail/smdb.h
--- com.orig/snert/include/com/snert/lib/mail/smdb.h	2004-09-02 11:33:54.000000000 +0200
+++ com/snert/include/com/snert/lib/mail/smdb.h	2005-05-03 15:12:50.000000000 +0200
@@ -45,7 +45,9 @@
 
 #ifdef LIBSNERT_WITH_BERKELEY_DB
 
-# if defined(HAVE_DB4_DB_H)
+# if defined(HAVE_WITH_DB_DB_H)
+#  include <db.h>
+# elif defined(HAVE_DB4_DB_H)
 #  include <db4/db.h>
 # elif defined(HAVE_DB3_DB_H)
 #  include <db3/db.h>
@@ -55,13 +57,11 @@
 #  error "LibSnert must be built with Berkeley DB support"
 # endif
 
-# if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 2 &&
DB_VERSION_PATCH >= 50
-#  define DBTXN		(DB_TXN *) 0,
-# elif DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1 && DB_VERSION_PATCH
>= 25
+# if   DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
 #  define DBTXN		(DB_TXN *) 0,
 # elif DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 0
 #  define DBTXN
-# elif DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR >= 2
+# elif DB_VERSION_MAJOR == 3
 #  define DBTXN
 # elif DB_VERSION_MAJOR == 2
 #  error "Berkeley DB 2.x not supported. Only 1.85 or 3.2 or better."
diff -ruN com.orig/snert/src/lib/configure com/snert/src/lib/configure
--- com.orig/snert/src/lib/configure	2004-09-06 10:20:06.000000000 +0200
+++ com/snert/src/lib/configure	2005-05-03 15:09:07.000000000 +0200
@@ -4978,7 +4978,7 @@
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 if test "$ac_cv_search_db_create" = no; then
-  for ac_lib in db-4.2 db-4.1 db-4.0 db4 db-3.3 db-3.2 db3 db; do
+  for ac_lib in db-4.3 db-4.2 db-4.1 db-4.0 db4 db-3.3 db-3.2 db3 db; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5184,7 +5184,7 @@
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 if test "$ac_cv_search_db_create_4002" = no; then
-  for ac_lib in db-4.2 db4 db; do
+  for ac_lib in db-4.3 db-4.2 db4 db; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
diff -ruN com.orig/snert/src/lib/util/Cache.c com/snert/src/lib/util/Cache.c
--- com.orig/snert/src/lib/util/Cache.c	2004-09-05 09:58:18.000000000 +0200
+++ com/snert/src/lib/util/Cache.c	2005-05-03 15:11:02.000000000 +0200
@@ -180,7 +180,9 @@
  *** Berkeley DB instance methods
  ***********************************************************************/
 
-#if defined(HAVE_DB4_DB_H)
+#if defined(HAVE_WITH_DB_DB_H)
+# include <db.h>
+#elif defined(HAVE_DB4_DB_H)
 # include <db4/db.h>
 #elif defined(HAVE_DB3_DB_H)
 # include <db3/db.h>
@@ -192,13 +194,11 @@
 # undef LIBSNERT_WITH_BERKELEY_DB
 #endif
 
-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 2 && DB_VERSION_PATCH
>= 50
-# define DBTXN		(DB_TXN *) 0,
-#elif DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1 && DB_VERSION_PATCH
>= 25
+#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
 # define DBTXN		(DB_TXN *) 0,
 #elif DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 0
 # define DBTXN
-#elif DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR >= 2
+#elif DB_VERSION_MAJOR == 3
 # define DBTXN
 
 #elif defined(HAVE_DBOPEN)

diff -ruN com.orig/snert/src/milter-sender/configure com/snert/src/milter-sender/configure
--- com.orig/snert/src/milter-sender/configure	2004-09-03 11:33:56.000000000 +0200
+++ com/snert/src/milter-sender/configure	2005-05-03 15:16:03.000000000 +0200
@@ -5325,7 +5325,7 @@
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 if test "$ac_cv_search_db_create" = no; then
-  for ac_lib in db-4.2 db-4.1 db-4.0 db4 db-3.3 db3 db; do
+  for ac_lib in db-4.3 db-4.2 db-4.1 db-4.0 db4 db-3.3 db3 db; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5531,7 +5531,7 @@
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 if test "$ac_cv_search_db_create_4002" = no; then
-  for ac_lib in db-4.2 db4 db; do
+  for ac_lib in db-4.3 db-4.2 db4 db; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */



Lists Index Date Thread Search