Some formatting changes and minor additions to the man pages.

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

diff --git a/lustre/configure.in b/lustre/configure.in
index 2b7c8ac..c172cd2 100644 (file)
--- a/lustre/configure.in
+++ b/lustre/configure.in
@@ -60,14 +60,28 @@ 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)
@@ -114,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 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)