[PVFS2-CVS] commit by slang in pvfs2: configure

[CVS commit program]

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

Modified Files:
	configure 
Log Message:
merging in fixes to berkeley db checking from 1.3.1 branch


Index: configure
===================================================================
RCS file: /projects/cvsroot/pvfs2/configure,v
diff -p -u -r1.262 -r1.263
--- configure	15 Nov 2005 16:41:31 -0000	1.262
+++ configure	18 Nov 2005 22:07:09 -0000	1.263
@@ -7525,10 +7525,8 @@ echo $ECHO_N "checking for db library...
     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"
 		cat >conftest.$ac_ext <<_ACEOF
-#include <db.h>
+#include "$dbpath/include/$dbheader/db.h"
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -7551,7 +7549,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  break
+  DB_CFLAGS="-I$dbpath/include/$dbheader/"
+			 break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -7561,10 +7560,8 @@ rm -f conftest.err conftest.$ac_objext c
 	done
 
 	if test "x$dbheader" != "xnotfound"; then
-		DB_CFLAGS="-I${dbpath}/include"
-		CFLAGS="${oldcflags} $DB_CFLAGS"
 		cat >conftest.$ac_ext <<_ACEOF
-#include <db.h>
+#include "$dbpath/include/db.h"
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -7587,7 +7584,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  :
+  DB_CFLAGS="-I$dbpath/include/"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -7604,8 +7601,9 @@ rm -f conftest.err conftest.$ac_objext c
         DB_LDFLAGS="-L${dbpath}/lib"
 	LDFLAGS="${LDFLAGS} $DB_LDFLAGS"
 
-	LIBS="${oldlibs} -ldb"
+	LIBS="${oldlibs} -ldb -lpthread"
 	DB_LIB="-ldb"
+	CFLAGS="$oldcflags $DB_CFLAGS"
 	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -7654,7 +7652,7 @@ rm -f conftest.err conftest.$ac_objext \
 
     else
         for lib in db4  db3  db  notfound; do
-           LIBS="${oldlibs} -l$lib"
+           LIBS="${oldlibs} -l$lib -lpthread"
            DB_LIB="-l$lib"
            cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -8131,10 +8129,8 @@ echo $ECHO_N "checking for db library...
     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"
 		cat >conftest.$ac_ext <<_ACEOF
-#include <db.h>
+#include "$dbpath/include/$dbheader/db.h"
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -8157,7 +8153,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  break
+  DB_CFLAGS="-I$dbpath/include/$dbheader/"
+			 break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -8167,10 +8164,8 @@ rm -f conftest.err conftest.$ac_objext c
 	done
 
 	if test "x$dbheader" != "xnotfound"; then
-		DB_CFLAGS="-I${dbpath}/include"
-		CFLAGS="${oldcflags} $DB_CFLAGS"
 		cat >conftest.$ac_ext <<_ACEOF
-#include <db.h>
+#include "$dbpath/include/db.h"
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -8193,7 +8188,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  :
+  DB_CFLAGS="-I$dbpath/include/"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -8210,8 +8205,9 @@ rm -f conftest.err conftest.$ac_objext c
         DB_LDFLAGS="-L${dbpath}/lib"
 	LDFLAGS="${LDFLAGS} $DB_LDFLAGS"
 
-	LIBS="${oldlibs} -ldb"
+	LIBS="${oldlibs} -ldb -lpthread"
 	DB_LIB="-ldb"
+	CFLAGS="$oldcflags $DB_CFLAGS"
 	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -8260,7 +8256,7 @@ rm -f conftest.err conftest.$ac_objext \
 
     else
         for lib in db4  db3  db  notfound; do
-           LIBS="${oldlibs} -l$lib"
+           LIBS="${oldlibs} -l$lib -lpthread"
            DB_LIB="-l$lib"
            cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */