X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fconfigure.in;h=c172cd2d7aeb7eee4ddf798d53ab46728e07554e;hb=baee98bd55a247f24d906a699f9e25fbd2877649;hp=d8e2ccc2c33ee102a4fc3040d60676c22910e91f;hpb=2ccf6c9c0919e9a7459aa35c95d4ade6f57a26d5;p=fs%2Flustre-release.git

diff --git a/lustre/configure.in b/lustre/configure.in
index d8e2ccc..c172cd2 100644
--- a/lustre/configure.in
+++ b/lustre/configure.in
@@ -45,19 +45,43 @@ 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=$(top_srcdir)/../portals)],, enable_portalsdir=$portalsdir_def)
+AC_ARG_ENABLE(portalsdir, [  --enable-portalsdir=[path] (deprecated) set path to Portals source (default=$portalsdir_def],, enable_portalsdir=$portalsdir_def)
 PORTALS=$enable_portalsdir
+
+if test $PORTALS = $portalsdir_def; then
+	PORTALSLOC='../portals'
+else
+	PORTALSLOC=$PORTALS
+fi
+
 AC_SUBST(PORTALS)
+AC_SUBST(PORTALSLOC)
 
-portalslib_def='$(top_srcdir)/../portals'
+portalslib_def=$enable_portalsdir/linux/utils
 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
+
+
+if ! test -z "$enable_portalslib"; then
+	PORTALSLIB=${enable_portalslib}
+fi
+
+
 AC_SUBST(PORTALSLIB)
 
 AC_MSG_CHECKING(if make dep has been run in kernel source)
@@ -104,6 +128,7 @@ 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 \
-	scripts/lustre.spec extN/Makefile)
+	cobd/Makefile ptlbd/Makefile conf/Makefile \
+	utils/Makefile utils/lconf tests/Makefile obdfilter/Makefile \
+        obdclass/Makefile llite/Makefile doc/Makefile scripts/Makefile \
+	scripts/lustre.spec extN/Makefile, chmod +x utils/lconf)