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

[CVS commit program]

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

Modified Files:
      Tag: slang-sio-branch
	bdb.m4 
Added Files:
      Tag: slang-sio-branch
	rt.m4 
Log Message:
stuff from trunk.


--- /dev/null	2003-01-30 05:24:37.000000000 -0500
+++ rt.m4	2005-11-18 17:32:08.000000000 -0500
@@ -0,0 +1,28 @@
+
+AC_DEFUN([AX_CHECK_NEEDS_LIBRT],
+[
+
+AC_MSG_CHECKING([if server lib needs -lrt])
+oldldflags=$LDFLAGS
+
+AC_TRY_LINK(
+	[#include <stdlib.h>
+	 #include <unistd.h>
+	 #include <aio.h>],
+	[lio_listio(LIO_NOWAIT, NULL, 0, NULL);],
+	[AC_MSG_RESULT(no)],
+	[
+		LDFLAGS="$LDFLAGS -lrt"
+		AC_TRY_LINK(
+			[#include <stdlib.h>
+			 #include <unistd.h>
+			 #include <aio.h>],
+			[lio_listio(LIO_NOWAIT, NULL, 0, NULL);],
+			[NEEDS_LIBRT=1
+			 AC_SUBST(NEEDS_LIBRT)
+			 AC_MSG_RESULT(yes)],
+			[AC_MSG_ERROR(failed attempting to link lio_listio)])
+	])
+
+LDFLAGS=$oldldflags
+])

Index: bdb.m4
===================================================================
RCS file: /projects/cvsroot/pvfs2/maint/config/bdb.m4,v
diff -p -u -r1.2.2.1 -r1.2.2.2
--- bdb.m4	11 Nov 2005 22:18:52 -0000	1.2.2.1
+++ bdb.m4	18 Nov 2005 22:32:07 -0000	1.2.2.2
@@ -14,41 +14,37 @@ AC_DEFUN([AX_BERKELEY_DB],
     lib=notfound
 
     if test "x$dbpath" != "x" ; then
-        DB_LDFLAGS="-L${dbpath}/lib"
-	LDFLAGS="${LDFLAGS} $DB_LDFLAGS"
-
 	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
-		LIBS="${oldlibs} -ldb"
-		DB_LIB="-ldb"
-		AC_TRY_LINK(
-			[#include <db.h>],
-			[DB *dbp; db_create(&dbp, NULL, 0);],
-			lib=db)
+		AC_COMPILE_IFELSE(
+			[#include "$dbpath/include/db.h"],
+			[DB_CFLAGS="-I$dbpath/include/"],
+			[AC_MSG_FAILURE(
+				Invalid libdb path specified. No db.h found.)])
 	fi
 
-	if test "x$lib" = "xnotfound"; then
-		DB_CFLAGS="-I${dbpath}/include"
-		CFLAGS="${oldcflags} $DB_CFLAGS"
-	fi
+        DB_LDFLAGS="-L${dbpath}/lib"
+	LDFLAGS="${LDFLAGS} $DB_LDFLAGS"
 
-        LIBS="${oldlibs} -ldb"
-        DB_LIB="-ldb"
-        AC_TRY_LINK(
-              [#include <db.h>],
-              [DB *dbp; db_create(&dbp, NULL, 0);],
-              lib=db)
+	LIBS="${oldlibs} -ldb -lpthread"
+	DB_LIB="-ldb"
+	CFLAGS="$oldcflags $DB_CFLAGS"
+	AC_TRY_LINK(
+		[#include <db.h>],
+		[DB *dbp; db_create(&dbp, NULL, 0);],
+		lib=db)
+	CFLAGS=$oldcflags
+	
     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>],
@@ -64,6 +60,7 @@ AC_DEFUN([AX_BERKELEY_DB],
     else
            AC_MSG_RESULT($lib)
     fi
+    AC_SUBST(DB_CFLAGS)	
     AC_SUBST(DB_LIB)
     
     dnl See if we have a new enough version of Berkeley DB; needed for