Prevent false "leak" because of OBD memory accounting.

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

diff --git a/lustre/configure.in b/lustre/configure.in
index d5ff2b1..482ecf3 100644 (file)
--- a/lustre/configure.in
+++ b/lustre/configure.in
@@ -15,16 +15,21 @@ 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.])
+# this doesn't seem to work on older autoconf
+# AC_CHECK_LIB(readline, readline,,)
+
+AC_ARG_ENABLE(readline,        [  --enable-readline  use readline library],,
+                       enable_readline="yes")
+ 
+if test "$enable_readline" = "yes" ; then
+   LIBREADLINE="-lreadline -lncurses"
+   HAVE_LIBREADLINE="-DHAVE_LIBREADLINE=1"
+else 
+   LIBREADLINE=""
+   HAVE_LIBREADLINE=""
 fi
-XML2_CFLAGS=$($XML2_CONFIG --cflags)
-XML2_LIBS=$($XML2_CONFIG --libs)
-AC_SUBST(XML2_CFLAGS)
-AC_SUBST(XML2_LIBS)
-
-AC_CHECK_LIB(readline, readline,,-lncurses)
+AC_SUBST(LIBREADLINE)
+AC_SUBST(HAVE_LIBREADLINE)
 
 # Kernel build environment.
 ac_default_prefix=
@@ -32,7 +37,8 @@ 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)
@@ -86,12 +92,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 tests/Makefile obdfilter/Makefile obdclass/Makefile \
+       llite/Makefile demos/Makefile doc/Makefile scripts/Makefile \
+       scripts/lustre.spec extN/Makefile)