[PVFS2-CVS] commit by slang in pvfs2/maint/config: bdb.m4

[CVS commit program]

Update of /projects/cvsroot/pvfs2/maint/config
In directory parlweb:/tmp/cvs-serv5377/maint/config

Modified Files:
	bdb.m4 
Log Message:
merging in fixes to berkeley db checking from 1.3.1 branch


Index: bdb.m4
===================================================================
RCS file: /projects/cvsroot/pvfs2/maint/config/bdb.m4,v
diff -p -u -r1.4 -r1.5
--- bdb.m4	15 Nov 2005 16:41:35 -0000	1.4
+++ bdb.m4	18 Nov 2005 22:07:10 -0000	1.5
@@ -16,19 +16,16 @@ AC_DEFUN([AX_BERKELEY_DB],
     if test "x$dbpath" != "x" ; then
 	oldcflags=$CFLAGS
 	for dbheader in db4 db3 notfound; do
-		DB_CFLAGS="-I${dbpath}/include/$dbheader"
-		CFLAGS="${oldcflags} $DB_CFLAGS"
 		AC_COMPILE_IFELSE(
-			[#include <db.h>],
-			[break])
+			[#include "$dbpath/include/$dbheader/db.h"],
+			[DB_CFLAGS="-I$dbpath/include/$dbheader/"
+			 break])
 	done
 
 	if test "x$dbheader" != "xnotfound"; then
-		DB_CFLAGS="-I${dbpath}/include"
-		CFLAGS="${oldcflags} $DB_CFLAGS"
 		AC_COMPILE_IFELSE(
-			[#include <db.h>],
-			[],
+			[#include "$dbpath/include/db.h"],
+			[DB_CFLAGS="-I$dbpath/include/"],
 			[AC_MSG_FAILURE(
 				Invalid libdb path specified. No db.h found.)])
 	fi
@@ -36,8 +33,9 @@ AC_DEFUN([AX_BERKELEY_DB],
         DB_LDFLAGS="-L${dbpath}/lib"
 	LDFLAGS="${LDFLAGS} $DB_LDFLAGS"
 
-	LIBS="${oldlibs} -ldb"
+	LIBS="${oldlibs} -ldb -lpthread"
 	DB_LIB="-ldb"
+	CFLAGS="$oldcflags $DB_CFLAGS"
 	AC_TRY_LINK(
 		[#include <db.h>],
 		[DB *dbp; db_create(&dbp, NULL, 0);],
@@ -46,7 +44,7 @@ AC_DEFUN([AX_BERKELEY_DB],
 	
     else
         for lib in db4  db3  db  notfound; do
-           LIBS="${oldlibs} -l$lib"
+           LIBS="${oldlibs} -l$lib -lpthread"
            DB_LIB="-l$lib"
            AC_TRY_LINK(
                   [#include <db.h>],