#
# 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_SUBST(LIBREADLINE)
+AC_SUBST(HAVE_LIBREADLINE)
# Kernel build environment.
ac_default_prefix=
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
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)
dnl We need to rid ourselves of the nasty [ ] quotes.
changequote(, )
-dnl LVERSION="`sed -ne 's/^VERSION[ ]*=[ ]*//gp' $LINUX/Makefile`"
-dnl PATCHLEVEL="`sed -ne 's/^PATCHLEVEL[ ]*=[ ]*//gp' $LINUX/Makefile`"
-dnl SUBLEVEL="`sed -ne 's/^SUBLEVEL[ ]*=[ ]*//gp' $LINUX/Makefile`"
-dnl EXTRAVERSION="`sed -ne 's/^EXTRAVERSION[ ]*=[ ]*//gp' $LINUX/Makefile`"
dnl Get release from version.h
-RELEASE="`sed -ne 's/.*UTS_RELEASE[ "]*\([0-9.a-zA-Z-]*\).*/\1/p' $LINUX/include/linux/version.h`"
+RELEASE="`sed -ne 's/.*UTS_RELEASE[ \"]*\([0-9.a-zA-Z-]*\).*/\1/p' $LINUX/include/linux/version.h`"
changequote([, ])
-dnl RELEASE="$LVERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION"
moduledir='$(libdir)/modules/'$RELEASE/kernel
AC_SUBST(moduledir)
-AC_SUBST(EXTRAVERSION)
-modulefsdir='$(moduledir)/fs'
+modulefsdir='$(moduledir)/fs/$(PACKAGE)'
AC_SUBST(modulefsdir)
AC_MSG_RESULT($RELEASE)
demodir='$(docdir)/demo'
AC_SUBST(demodir)
-AC_OUTPUT(Makefile lov/Makefile lib/Makefile ldlm/Makefile \
- obdecho/Makefile ptlrpc/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)
-# obdfs/Makefile
\ No newline at end of file
+# 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 doc/Makefile scripts/Makefile \
+ scripts/lustre.spec extN/Makefile)