File containing read/write fptr implementations for PTLRPC device. To be added to...

[fs/lustre-release.git] / lustre / configure.in

diff --git a/lustre/configure.in b/lustre/configure.in
index d4bed74..2b7c8ac 100644 (file)
--- a/lustre/configure.in
+++ b/lustre/configure.in
@@ -45,15 +45,31 @@ AC_SUBST(LINUX)
 
 sinclude(archdep.m4)
 
+AC_MSG_CHECKING(if you are running linux 2.5...)
+if test -e $LINUX/include/linux/namei.h ; then
+       linux25=yes
+       AC_MSG_RESULT(yes)
+else
+       linux25=no
+       AC_MSG_RESULT(no)
+fi
+AM_CONDITIONAL(LINUX25, test x$linux25 = xyes)
+
 KINCFLAGS='-I. -I$(top_srcdir)/include -I$(PORTALS)/include -I$(LINUX)/include'
 CPPFLAGS="$KINCFLAGS $ARCHCPPFLAGS"
 
 portalsdir_def='$(top_srcdir)/../portals'
 AC_ARG_WITH(portals, [  --with-portals=[path] set path to Portals source (default=../portals)], enable_portalsdir=$withval)
-AC_ARG_ENABLE(portalsdir, [  --enable-portalsdir=[path] (deprecated) set path to Portals source (default=../portals)],, enable_portalsdir=$portalsdir_def)
+AC_ARG_ENABLE(portalsdir, [  --enable-portalsdir=[path] (deprecated) set path to Portals source (default=$(top_srcdir)/../portals)],, enable_portalsdir=$portalsdir_def)
 PORTALS=$enable_portalsdir
 AC_SUBST(PORTALS)
 
+portalslib_def='$(top_srcdir)/../portals'
+AC_ARG_WITH(portalslib, [  --with-portalslib=[path] set path to Portals library (default=../portals/linux/utils)], enable_portalslib=$withval)
+AC_ARG_ENABLE(portalslib, [  --enable-portalslib=[path] (deprecated) set path to Portals lib (default=../portals/linux/utils)],, enable_portalslib=$portalslib_def)
+PORTALSLIB=$enable_portalslib/linux/utils
+AC_SUBST(PORTALSLIB)
+
 AC_MSG_CHECKING(if make dep has been run in kernel source)
 if test -f $LINUX/include/linux/config.h ; then
        AC_MSG_RESULT(yes)
@@ -99,5 +115,5 @@ AC_SUBST(demodir)
 AC_OUTPUT(Makefile lib/Makefile ldlm/Makefile obdecho/Makefile ptlrpc/Makefile \
        lov/Makefile osc/Makefile mdc/Makefile mds/Makefile ost/Makefile \
        utils/Makefile tests/Makefile obdfilter/Makefile obdclass/Makefile \
-       llite/Makefile demos/Makefile doc/Makefile scripts/Makefile \
+       llite/Makefile doc/Makefile scripts/Makefile \
        scripts/lustre.spec extN/Makefile)