X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fconfigure.in;h=47c3d351bc75bf2a8e08c5d386e81b0035bf9e88;hb=cc669f5de2e3017bea33065b6b085691b042f7bb;hp=453465a23d29b1aa3a5fcc72a935a535455e2aa5;hpb=05800a5d532ca4c1dc11d518bbbc4ca1506c4f85;p=fs%2Flustre-release.git

diff --git a/lustre/configure.in b/lustre/configure.in
index 453465a..47c3d35 100644
--- a/lustre/configure.in
+++ b/lustre/configure.in
@@ -15,15 +15,6 @@ AC_PROG_RANLIB
 # 
 # Check for required packages
 
-AC_PATH_PROG([XML2_CONFIG], [xml2-config], [],)
-if test -z "$XML2_CONFIG"; then
-	AC_MSG_ERROR([xml2-config not found; libxml2-dev libraries must be installed.])
-fi
-XML2_CFLAGS=$($XML2_CONFIG --cflags)
-XML2_LIBS=$($XML2_CONFIG --libs)
-AC_SUBST(XML2_CFLAGS)
-AC_SUBST(XML2_LIBS)
-
 # this doesn't seem to work on older autoconf
 # AC_CHECK_LIB(readline, readline,,)
 
@@ -46,20 +37,52 @@ bindir='${exec_prefix}/usr/bin'
 sbindir='${exec_prefix}/usr/sbin'
 
 linuxdir_def=/usr/src/linux
-AC_ARG_ENABLE(linuxdir, [  --enable-linuxdir=[path] set path to Linux source (default=/usr/src/linux)],, enable_linuxdir=$linuxdir_def)
+AC_ARG_WITH(linux, [  --with-linux=[path] set path to Linux source (default=/usr/src/linux)], enable_linuxdir=$withval)
+AC_ARG_ENABLE(linuxdir, [  --enable-linuxdir=[path] (deprecated) set path to Linux source (default=/usr/src/linux)],, enable_linuxdir=$linuxdir_def)
 
 LINUX=$enable_linuxdir
 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_ENABLE(portalsdir, [  --enable-portalsdir=[path] set path to Portals source (default=../portals)],, enable_portalsdir=$portalsdir_def)
+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)
 PORTALS=$enable_portalsdir
+
+if test $PORTALS = $portalsdir_def; then
+	PORTALSLOC='../portals'
+else
+	PORTALSLOC=$PORTALS
+fi
+
 AC_SUBST(PORTALS)
+AC_SUBST(PORTALSLOC)
+
+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)
+
+
+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)
 if test -f $LINUX/include/linux/config.h ; then
@@ -100,12 +123,11 @@ AC_SUBST(docdir)
 demodir='$(docdir)/demo'
 AC_SUBST(demodir)
 
-AM_CONFIG_HEADER(include/config.h)
+# not needed until the AC_CHECK_LIB(readline) above works
+# AM_CONFIG_HEADER(include/config.h)
 
-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 obdfs/Makefile demos/Makefile \
-	doc/Makefile scripts/Makefile scripts/lustre.spec \
-	extN/Makefile)
+AC_OUTPUT(Makefile lib/Makefile ldlm/Makefile obdecho/Makefile ptlrpc/Makefile \
+	lov/Makefile osc/Makefile mdc/Makefile mds/Makefile ost/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)