[Pvfs2-cvs] commit by slang in pvfs2/maint/config: gm.m4 mx.m4
kernel.m4 openssl.m4 rt.m4
CVS commit program
cvs at parl.clemson.edu
Tue Apr 1 18:24:58 EST 2008
Update of /projects/cvsroot/pvfs2/maint/config
In directory parlweb1:/tmp/cvs-serv26625/maint/config
Modified Files:
Tag: pvfs-2-7-branch
kernel.m4 openssl.m4 rt.m4
Added Files:
Tag: pvfs-2-7-branch
gm.m4 mx.m4
Log Message:
merge a bunch of fixes made to HEAD since 2.7.0.
--- /dev/null 2004-06-24 14:04:38.000000000 -0400
+++ gm.m4 2008-04-01 18:24:58.000000000 -0500
@@ -0,0 +1,72 @@
+#
+# Configure rules for GM
+#
+# Copyright (C) 2008 Pete Wyckoff <pw at osc.edu>
+#
+# See COPYING in top-level directory.
+#
+AC_DEFUN([AX_GM],
+[
+ dnl Configure options for GM install path.
+ dnl --with-gm=<dir> is shorthand for
+ dnl --with-gm-includes=<dir>/include
+ dnl --with-gm-libs=<dir>/lib (or lib64 if that exists)
+ gm_home=
+ AC_ARG_WITH(gm,
+ [ --with-gm=<dir> Location of the GM install (default no GM)],
+ if test -z "$withval" -o "$withval" = yes ; then
+ AC_MSG_ERROR([Option --with-gm requires the path to your GM tree.])
+ elif test "$withval" != no ; then
+ gm_home="$withval"
+ fi
+ )
+ AC_ARG_WITH(gm-includes,
+ [ --with-gm-includes=<dir> Location of the GM includes],
+ if test -z "$withval" -o "$withval" = yes ; then
+ AC_MSG_ERROR([Option --with-gm-includes requires path to GM headers.])
+ elif test "$withval" != no ; then
+ GM_INCDIR="$withval"
+ fi
+ )
+ AC_ARG_WITH(gm-libs,
+ [ --with-gm-libs=<dir> Location of the GM libraries],
+ if test -z "$withval" -o "$withval" = yes ; then
+ AC_MSG_ERROR([Option --with-gm-libs requires path to GM libraries.])
+ elif test "$withval" != no ; then
+ GM_LIBDIR="$withval"
+ fi
+ )
+ dnl If supplied the incls and libs explicitly, use them, else populate them
+ dnl using guesses from the --with-gm dir.
+ if test -n "$gm_home" ; then
+ if test -z "$GM_INCDIR"; then
+ GM_INCDIR=$gm_home/include
+ fi
+ if test -z "$GM_LIBDIR"; then
+ GM_LIBDIR=$gm_home/lib64
+ if test ! -d "$GM_LIBDIR" ; then
+ GM_LIBDIR=$gm_home/lib
+ fi
+ fi
+ fi
+ dnl If anything GM-ish was set, go look for header.
+ if test -n "$GM_INCDIR$GM_LIBDIR" ; then
+ save_cppflags="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -I$GM_INCDIR -I$GM_INCDIR/gm"
+ AC_CHECK_HEADER(gm.h,, AC_MSG_ERROR([Header gm.h not found.]))
+ dnl Run test is not possible on a machine that does not have a GM NIC.
+ dnl Link test would work, but just check for existence.
+ if test ! -f $GM_LIBDIR/libgm.so ; then
+ if test ! -f $GM_LIBDIR/libgm.a ; then
+ AC_MSG_ERROR([Neither GM library libgm.so or libgm.a found.])
+ fi
+ fi
+ BUILD_GM=1
+ CPPFLAGS="$save_cppflags"
+ fi
+ AC_SUBST(BUILD_GM)
+ AC_SUBST(GM_INCDIR)
+ AC_SUBST(GM_LIBDIR)
+])
+
+dnl vim: set ft=config :
--- /dev/null 2004-06-24 14:04:38.000000000 -0400
+++ mx.m4 2008-04-01 18:24:58.000000000 -0500
@@ -0,0 +1,73 @@
+#
+# Configure rules for MX
+#
+# Copyright (C) 2008 Pete Wyckoff <pw at osc.edu>
+#
+# See COPYING in top-level directory.
+#
+AC_DEFUN([AX_MX],
+[
+ dnl Configure options for MX install path.
+ dnl --with-mx=<dir> is shorthand for
+ dnl --with-mx-includes=<dir>/include
+ dnl --with-mx-libs=<dir>/lib (or lib64 if that exists)
+ mx_home=
+ AC_ARG_WITH(mx,
+ [ --with-mx=<dir> Location of the MX install (default no MX)],
+ if test -z "$withval" -o "$withval" = yes ; then
+ AC_MSG_ERROR([Option --with-mx requires the path to your MX tree.])
+ elif test "$withval" != no ; then
+ mx_home="$withval"
+ fi
+ )
+ AC_ARG_WITH(mx-includes,
+ [ --with-mx-includes=<dir> Location of the MX includes],
+ if test -z "$withval" -o "$withval" = yes ; then
+ AC_MSG_ERROR([Option --with-mx-includes requires path to MX headers.])
+ elif test "$withval" != no ; then
+ MX_INCDIR="$withval"
+ fi
+ )
+ AC_ARG_WITH(mx-libs,
+ [ --with-mx-libs=<dir> Location of the MX libraries],
+ if test -z "$withval" -o "$withval" = yes ; then
+ AC_MSG_ERROR([Option --with-mx-libs requires path to MX libraries.])
+ elif test "$withval" != no ; then
+ MX_LIBDIR="$withval"
+ fi
+ )
+ dnl If supplied the incls and libs explicitly, use them, else populate them
+ dnl using guesses from the --with-mx dir.
+ if test -n "$mx_home" ; then
+ if test -z "$MX_INCDIR"; then
+ MX_INCDIR=$mx_home/include
+ fi
+ if test -z "$MX_LIBDIR"; then
+ MX_LIBDIR=$mx_home/lib64
+ if test ! -d "$MX_LIBDIR" ; then
+ MX_LIBDIR=$mx_home/lib
+ fi
+ fi
+ fi
+ dnl If anything MX-ish was set, go look for header.
+ if test -n "$MX_INCDIR$MX_LIBDIR" ; then
+ save_cppflags="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -I$MX_INCDIR -I$MX_INCDIR/mx"
+ AC_CHECK_HEADER(myriexpress.h,,
+ AC_MSG_ERROR([Header myriexpress.h not found.]))
+ dnl Run test is not possible on a machine that does not have a MX NIC.
+ dnl Link test would work, but just check for existence.
+ if test ! -f $MX_LIBDIR/libmyriexpress.so ; then
+ if test ! -f $MX_LIBDIR/libmyriexpress.a ; then
+ AC_MSG_ERROR([Neither MX library libmyriexpress.so or libmyriexpress.a found.])
+ fi
+ fi
+ BUILD_MX=1
+ CPPFLAGS="$save_cppflags"
+ fi
+ AC_SUBST(BUILD_MX)
+ AC_SUBST(MX_INCDIR)
+ AC_SUBST(MX_LIBDIR)
+])
+
+dnl vim: set ft=config :
Index: kernel.m4
===================================================================
RCS file: /projects/cvsroot/pvfs2/maint/config/kernel.m4,v
diff -p -u -r1.46.2.4 -r1.46.2.5
--- kernel.m4 1 Apr 2008 21:32:31 -0000 1.46.2.4
+++ kernel.m4 1 Apr 2008 23:24:57 -0000 1.46.2.5
@@ -893,7 +893,20 @@ AC_DEFUN([AX_KERNEL_FEATURES],
spin_lock(&as.page_lock);
],
AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_SPIN_LOCK_ADDR_SPACE_STRUCT, 1, [Define if kernel address_space struct has a spin_lock instead of rw_lock]),
+ AC_DEFINE(HAVE_SPIN_LOCK_PAGE_ADDR_SPACE_STRUCT, 1, [Define if kernel address_space struct has a spin_lock member named page_lock instead of rw_lock]),
+ AC_MSG_RESULT(no)
+ )
+
+ AC_MSG_CHECKING(if kernel address_space struct has a rwlock_t field named tree_lock)
+ AC_TRY_COMPILE([
+ #define __KERNEL__
+ #include <linux/fs.h>
+ ], [
+ struct address_space as;
+ read_lock(&as.tree_lock);
+ ],
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_SPIN_LOCK_TREE_ADDR_SPACE_STRUCT, 1, [Define if kernel address_space struct has a spin_lock member named tree_lock instead of rw_lock]),
AC_MSG_RESULT(no)
)
@@ -920,6 +933,20 @@ AC_DEFUN([AX_KERNEL_FEATURES],
],
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_MAPPING_NRPAGES_MACRO, 1, [Define if kernel defines mapping_nrpages macro -- defined by RT linux]),
+ AC_MSG_RESULT(no)
+ )
+
+ dnl Starting with 2.6.25-rc1, .read_inode goes away.
+ AC_MSG_CHECKING(if kernel super_operations contains read_inode field)
+ AC_TRY_COMPILE([
+ #define __KERNEL__
+ #include <linux/fs.h>
+ ], [
+ struct super_operations sops;
+ sops.read_inode(NULL);
+ ],
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_READ_INODE, 1, [Define if kernel super_operations contains read_inode field]),
AC_MSG_RESULT(no)
)
Index: openssl.m4
===================================================================
RCS file: /projects/cvsroot/pvfs2/maint/config/openssl.m4,v
diff -p -u -r1.7 -r1.7.16.1
--- openssl.m4 19 Sep 2006 21:44:49 -0000 1.7
+++ openssl.m4 1 Apr 2008 23:24:58 -0000 1.7.16.1
@@ -12,7 +12,7 @@ AC_DEFUN([AX_OPENSSL],
LDFLAGS="$LDFLAGS -L${opensslpath}/lib64 -L${opensslpath}/lib"
SERVER_LDFLAGS="$SERVER_LDFLAGS -L${opensslpath}/lib64 -L${opensslpath}/lib"
fi
- LIBS="$LIBS -lcrypt -lssl"
+ LIBS="$LIBS -lcrypto -lssl"
AC_COMPILE_IFELSE(
[#include "openssl/bio.h"],
@@ -36,7 +36,7 @@ AC_DEFUN([AX_OPENSSL_OPTIONAL],
[
AC_MSG_CHECKING([for openssl library])
TMPLIBS=${LIBS}
- LIBS="$LIBS -lcrypt -lssl"
+ LIBS="$LIBS -lcrypto -lssl"
AC_COMPILE_IFELSE(
[#include "openssl/bio.h"],
Index: rt.m4
===================================================================
RCS file: /projects/cvsroot/pvfs2/maint/config/rt.m4,v
diff -p -u -r1.1 -r1.1.50.1
--- rt.m4 10 Nov 2005 01:26:56 -0000 1.1
+++ rt.m4 1 Apr 2008 23:24:58 -0000 1.1.50.1
@@ -3,8 +3,6 @@ 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>
@@ -12,7 +10,8 @@ AC_TRY_LINK(
[lio_listio(LIO_NOWAIT, NULL, 0, NULL);],
[AC_MSG_RESULT(no)],
[
- LDFLAGS="$LDFLAGS -lrt"
+ oldlibs=$LIBS
+ LIBS="$LIBS -lrt"
AC_TRY_LINK(
[#include <stdlib.h>
#include <unistd.h>
@@ -22,7 +21,6 @@ AC_TRY_LINK(
AC_SUBST(NEEDS_LIBRT)
AC_MSG_RESULT(yes)],
[AC_MSG_ERROR(failed attempting to link lio_listio)])
+ LIBS=$oldlibs
])
-
-LDFLAGS=$oldldflags
])
More information about the Pvfs2-cvs
mailing list