[Pkg-lustre-svn-commit] r308 - /trunk/debian/patches/autogen-run.dpatch
pwinnertz-guest at users.alioth.debian.org
pwinnertz-guest at users.alioth.debian.org
Fri Sep 14 12:39:49 UTC 2007
Author: pwinnertz-guest
Date: Fri Sep 14 12:39:49 2007
New Revision: 308
URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=308
Log:
run autogen.sh with the modified informations... if this doesn't work please revert to the versoin before :)
Modified:
trunk/debian/patches/autogen-run.dpatch
Modified: trunk/debian/patches/autogen-run.dpatch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/autogen-run.dpatch?rev=308&op=diff
==============================================================================
--- trunk/debian/patches/autogen-run.dpatch (original)
+++ trunk/debian/patches/autogen-run.dpatch Fri Sep 14 12:39:49 2007
@@ -5,52 +5,16 @@
## DP: Result of running autogen.sh
@DPATCH@
-diff -urNad lustre-1.6.2~/aclocal.m4 lustre-1.6.2/aclocal.m4
---- lustre-1.6.2~/aclocal.m4 2007-08-30 00:29:34.000000000 +0200
-+++ lustre-1.6.2/aclocal.m4 2007-09-06 14:19:02.518425826 +0200
+
+diff -Nurwd orig/lustre-1.6.2/aclocal.m4 lustre-1.6.2/aclocal.m4
+--- orig/lustre-1.6.2/aclocal.m4 2007-08-30 00:29:34.000000000 +0200
++++ lustre-1.6.2/aclocal.m4 2007-09-14 13:58:26.000000000 +0200
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.7.8 -*- Autoconf -*-
+# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
-@@ -482,21 +482,21 @@
- fi
-
- # FIXME
--AC_CHECK_DECL([__i386__], [], [
--
--if test x$enable_bgl != xyes; then
--AC_MSG_CHECKING([if $CC accepts -m64])
--CC_save="$CC"
--CC="$CC -m64"
--AC_TRY_COMPILE([],[],[
-- AC_MSG_RESULT([yes])
--],[
-- AC_MSG_RESULT([no])
-- CC="$CC_save"
--])
--fi
--
--])
-+#AC_CHECK_DECL([__i386__], [], [
-+#
-+#if test x$enable_bgl != xyes; then
-+#AC_MSG_CHECKING([if $CC accepts -m64])
-+#CC_save="$CC"
-+#CC="$CC -m64"
-+#AC_TRY_COMPILE([],[],[
-+# AC_MSG_RESULT([yes])
-+#],[
-+# AC_MSG_RESULT([no])
-+# CC="$CC_save"
-+#])
-+#fi
-+#
-+#])
-
- CPPFLAGS="-I\$(top_builddir)/lnet/include -I\$(top_srcdir)/lnet/include -I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS"
-
@@ -4067,113 +4067,6 @@
])
@@ -174,154 +138,10 @@
# Helper functions for option handling. -*- Autoconf -*-
-diff -urNad lustre-1.6.2~/autoMakefile.in lustre-1.6.2/autoMakefile.in
---- lustre-1.6.2~/autoMakefile.in 2007-08-30 00:29:50.000000000 +0200
-+++ lustre-1.6.2/autoMakefile.in 2007-09-06 14:19:05.831920332 +0200
-@@ -1,4 +1,4 @@
--# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
-+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
- # @configure_input@
-
- # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-@@ -115,12 +115,11 @@
- EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
- EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
- EXTRA_KCFLAGS = @EXTRA_KCFLAGS@
--EXTRA_KLDFLAGS = @EXTRA_KLDFLAGS@
--EXTRA_KLIBS = @EXTRA_KLIBS@
- EXTRA_LNET_INCLUDE = @EXTRA_LNET_INCLUDE@
- GMCPPFLAGS = @GMCPPFLAGS@
- GMLIBS = @GMLIBS@
- GMLND = @GMLND@
-+GREP = @GREP@
- IIBCPPFLAGS = @IIBCPPFLAGS@
- IIBLND = @IIBLND@
- INCLUDE_RULES = @INCLUDE_RULES@
-@@ -216,8 +215,6 @@
- VIBLND = @VIBLND@
- ac_configure_args = @ac_configure_args@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- agentdir = @agentdir@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -231,34 +228,37 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- demodir = @demodir@
- docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
--kextdir = @kextdir@
- lb_target_os = @lb_target_os@
- libdir = @libdir@
- libexecdir = @libexecdir@
- linux25 = @linux25@
-+localedir = @localedir@
- localstatedir = @localstatedir@
--macosdir = @macosdir@
- mandir = @mandir@
- mibdir = @mibdir@
- moduledir = @moduledir@
- modulefsdir = @modulefsdir@
- modulenetdir = @modulenetdir@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pkgexampledir = @pkgexampledir@
--plistdir = @plistdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- rootsbindir = @rootsbindir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-@@ -301,6 +301,8 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
- CONFIG_CLEAN_FILES = Makefile Rules lustre.spec \
-+ lnet/include/libcfs/darwin/Makefile \
-+ lnet/include/lnet/darwin/Makefile lnet/libcfs/darwin/Makefile \
- lustre/kernel_patches/targets/2.6-suse.target \
- lustre/kernel_patches/targets/2.6-vanilla.target \
- lustre/kernel_patches/targets/2.6-rhel4.target \
-@@ -312,7 +314,8 @@
- lustre/kernel_patches/targets/rh-2.4.target \
- lustre/kernel_patches/targets/rhel-2.4.target \
- lustre/kernel_patches/targets/suse-2.4.21-2.target \
-- lustre/kernel_patches/targets/sles-2.4.target
-+ lustre/kernel_patches/targets/sles-2.4.target \
-+ lustre/obdclass/darwin/Makefile
- DIST_SOURCES =
-
- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-@@ -323,8 +326,9 @@
- DIST_COMMON = README $(srcdir)/autoMakefile.in \
- $(srcdir)/build/autoMakefile.am.toplevel $(srcdir)/configure \
- COPYING ChangeLog Makefile.in aclocal.m4 autoMakefile.am \
-- compile config.guess config.h.in config.sub configure.ac \
-- depcomp install-sh lustre.spec.in missing mkinstalldirs
-+ compile config.guess config.h.in config.sub configure \
-+ configure.ac depcomp install-sh lustre.spec.in missing \
-+ mkinstalldirs
- all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-@@ -368,6 +372,12 @@
- cd $(top_builddir) && $(SHELL) ./config.status $@
- lustre.spec: $(top_builddir)/config.status lustre.spec.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
-+lnet/include/libcfs/darwin/Makefile: $(top_builddir)/config.status $(top_srcdir)/lnet/include/libcfs/darwin/Makefile.in
-+ cd $(top_builddir) && $(SHELL) ./config.status $@
-+lnet/include/lnet/darwin/Makefile: $(top_builddir)/config.status $(top_srcdir)/lnet/include/lnet/darwin/Makefile.in
-+ cd $(top_builddir) && $(SHELL) ./config.status $@
-+lnet/libcfs/darwin/Makefile: $(top_builddir)/config.status $(top_srcdir)/lnet/libcfs/darwin/Makefile.in
-+ cd $(top_builddir) && $(SHELL) ./config.status $@
- lustre/kernel_patches/targets/2.6-suse.target: $(top_builddir)/config.status $(top_srcdir)/lustre/kernel_patches/targets/2.6-suse.target.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
- lustre/kernel_patches/targets/2.6-vanilla.target: $(top_builddir)/config.status $(top_srcdir)/lustre/kernel_patches/targets/2.6-vanilla.target.in
-@@ -392,6 +402,8 @@
- cd $(top_builddir) && $(SHELL) ./config.status $@
- lustre/kernel_patches/targets/sles-2.4.target: $(top_builddir)/config.status $(top_srcdir)/lustre/kernel_patches/targets/sles-2.4.target.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
-+lustre/obdclass/darwin/Makefile: $(top_builddir)/config.status $(top_srcdir)/lustre/obdclass/darwin/Makefile.in
-+ cd $(top_builddir) && $(SHELL) ./config.status $@
- uninstall-info-am:
-
- # This directory's subdirectories are mostly independent; you can cd
-@@ -507,7 +519,7 @@
- distdir: $(DISTFILES)
- $(am__remove_distdir)
- mkdir $(distdir)
-- $(mkinstalldirs) $(distdir)/. $(distdir)/./build $(distdir)/build $(distdir)/build/autoconf $(distdir)/lnet $(distdir)/lnet/klnds $(distdir)/lnet/klnds/ciblnd $(distdir)/lnet/klnds/gmlnd $(distdir)/lnet/klnds/iiblnd $(distdir)/lnet/klnds/mxlnd $(distdir)/lnet/klnds/o2iblnd $(distdir)/lnet/klnds/openiblnd $(distdir)/lnet/klnds/ptllnd $(distdir)/lnet/klnds/qswlnd $(distdir)/lnet/klnds/ralnd $(distdir)/lnet/klnds/socklnd $(distdir)/lnet/klnds/viblnd $(distdir)/lnet/libcfs $(distdir)/lnet/lnet $(distdir)/lnet/selftest $(distdir)/lnet/ulnds $(distdir)/lustre $(distdir)/lustre/include $(distdir)/lustre/kernel_patches/targets $(distdir)/lustre/llite $(distdir)/lustre/lov $(distdir)/lustre/lvfs $(distdir)/lustre/mdc $(distdir)/lustre/mds $(distdir)/lustre/mgc $(distdir)/lustre/mgs $(distdir)/lustre/obdclass $(distdir)/lustre/obdecho $(distdir)/lustre/obdfilter $(distdir)/lustre/osc $(distdir)/lustre/ost $(distdir)/lustre/ptlrpc $(distdir)/lustre/quota $(distdir)/lustre/scripts
-+ $(mkinstalldirs) $(distdir)/. $(distdir)/./build $(distdir)/build $(distdir)/build/autoconf $(distdir)/lnet $(distdir)/lnet/include/libcfs/darwin $(distdir)/lnet/include/lnet/darwin $(distdir)/lnet/klnds $(distdir)/lnet/klnds/ciblnd $(distdir)/lnet/klnds/gmlnd $(distdir)/lnet/klnds/iiblnd $(distdir)/lnet/klnds/mxlnd $(distdir)/lnet/klnds/o2iblnd $(distdir)/lnet/klnds/openiblnd $(distdir)/lnet/klnds/ptllnd $(distdir)/lnet/klnds/qswlnd $(distdir)/lnet/klnds/ralnd $(distdir)/lnet/klnds/socklnd $(distdir)/lnet/klnds/viblnd $(distdir)/lnet/libcfs $(distdir)/lnet/libcfs/darwin $(distdir)/lnet/lnet $(distdir)/lnet/selftest $(distdir)/lnet/ulnds $(distdir)/lustre $(distdir)/lustre/include $(distdir)/lustre/kernel_patches/targets $(distdir)/lustre/llite $(distdir)/lustre/lov $(distdir)/lustre/lvfs $(distdir)/lustre/mdc $(distdir)/lustre/mds $(distdir)/lustre/mgc $(distdir)/lustre/mgs $(distdir)/lustre/obdclass $(distdir)/lustre/obdclass/darwin $(distdir)/lustre/obdecho $(distdir)/lustre/obdfilter $(distdir)/lustre/osc $(distdir)/lustre/ost $(distdir)/lustre/ptlrpc $(distdir)/lustre/quota $(distdir)/lustre/scripts
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
-@@ -636,7 +648,7 @@
- installcheck: installcheck-recursive
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-- INSTALL_STRIP_FLAG=-s \
-+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-diff -urNad lustre-1.6.2~/autom4te.cache/output.0 lustre-1.6.2/autom4te.cache/output.0
---- lustre-1.6.2~/autom4te.cache/output.0 1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.6.2/autom4te.cache/output.0 2007-09-06 14:19:04.829073322 +0200
-@@ -0,0 +1,16213 @@
+diff -Nurwd orig/lustre-1.6.2/autom4te.cache/output.0 lustre-1.6.2/autom4te.cache/output.0
+--- orig/lustre-1.6.2/autom4te.cache/output.0 1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.6.2/autom4te.cache/output.0 2007-09-14 13:58:29.000000000 +0200
+@@ -0,0 +1,16313 @@
+@%:@! /bin/sh
+@%:@ Guess values for system-dependent variables and create Makefiles.
+@%:@ Generated by GNU Autoconf 2.61 for Lustre LUSTRE_VERSION.
@@ -5227,21 +5047,121 @@
+fi
+
+# FIXME
-+#AC_CHECK_DECL([__i386__], [], [
-+#
-+#if test x$enable_bgl != xyes; then
-+#AC_MSG_CHECKING([if $CC accepts -m64])
-+#CC_save="$CC"
-+#CC="$CC -m64"
-+#AC_TRY_COMPILE([],[],[
-+# AC_MSG_RESULT([yes])
-+#],[
-+# AC_MSG_RESULT([no])
-+# CC="$CC_save"
-+#])
-+#fi
-+#
-+#])
++{ echo "$as_me:$LINENO: checking whether __i386__ is declared" >&5
++echo $ECHO_N "checking whether __i386__ is declared... $ECHO_C" >&6; }
++if test "${ac_cv_have_decl___i386__+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++int
++main ()
++{
++#ifndef __i386__
++ (void) __i386__;
++#endif
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_have_decl___i386__=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_cv_have_decl___i386__=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_have_decl___i386__" >&5
++echo "${ECHO_T}$ac_cv_have_decl___i386__" >&6; }
++if test $ac_cv_have_decl___i386__ = yes; then
++ :
++else
++
++
++if test x$enable_bgl != xyes; then
++{ echo "$as_me:$LINENO: checking if $CC accepts -m64" >&5
++echo $ECHO_N "checking if $CC accepts -m64... $ECHO_C" >&6; }
++CC_save="$CC"
++CC="$CC -m64"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++ CC="$CC_save"
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++
++fi
++
+
+CPPFLAGS="-I\$(top_builddir)/lnet/include -I\$(top_srcdir)/lnet/include -I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS"
+
@@ -16535,9 +16455,9 @@
+Type 'make' to build Lustre.
+_ACEOF
+
-diff -urNad lustre-1.6.2~/autom4te.cache/requests lustre-1.6.2/autom4te.cache/requests
---- lustre-1.6.2~/autom4te.cache/requests 1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.6.2/autom4te.cache/requests 2007-09-06 14:19:12.269938172 +0200
+diff -Nurwd orig/lustre-1.6.2/autom4te.cache/requests lustre-1.6.2/autom4te.cache/requests
+--- orig/lustre-1.6.2/autom4te.cache/requests 1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.6.2/autom4te.cache/requests 2007-09-14 13:58:37.000000000 +0200
@@ -0,0 +1,64 @@
+# This file was generated by Autom4te Wed Jan 17 19:57:31 PST 2007.
+# It contains the lists of macros which have been traced.
@@ -16556,15 +16476,15 @@
+ 'configure.ac'
+ ],
+ {
++ 'AM_PROG_F77_C_O' => 1,
+ '_LT_AC_TAGCONFIG' => 1,
-+ 'AM_PROG_F77_C_O' => 1,
++ 'm4_pattern_forbid' => 1,
+ 'AC_INIT' => 1,
-+ 'm4_pattern_forbid' => 1,
+ 'AC_CANONICAL_TARGET' => 1,
++ 'AC_CONFIG_LIBOBJ_DIR' => 1,
+ 'AC_SUBST' => 1,
-+ 'AC_CONFIG_LIBOBJ_DIR' => 1,
++ 'AC_CANONICAL_HOST' => 1,
+ 'AC_FC_SRCEXT' => 1,
-+ 'AC_CANONICAL_HOST' => 1,
+ 'AC_PROG_LIBTOOL' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
+ 'AC_CONFIG_SUBDIRS' => 1,
@@ -16572,8 +16492,8 @@
+ 'LT_CONFIG_LTDL_DIR' => 1,
+ 'AC_REQUIRE_AUX_FILE' => 1,
+ 'AC_CONFIG_LINKS' => 1,
++ 'LT_SUPPORTED_TAG' => 1,
+ 'm4_sinclude' => 1,
-+ 'LT_SUPPORTED_TAG' => 1,
+ 'AM_MAINTAINER_MODE' => 1,
+ 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+ '_m4_warn' => 1,
@@ -16590,11 +16510,11 @@
+ 'AH_OUTPUT' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
+ 'AC_CONFIG_AUX_DIR' => 1,
++ 'm4_pattern_allow' => 1,
++ 'AM_PROG_CC_C_O' => 1,
+ 'sinclude' => 1,
-+ 'AM_PROG_CC_C_O' => 1,
-+ 'm4_pattern_allow' => 1,
++ 'AM_CONDITIONAL' => 1,
+ 'AC_CANONICAL_SYSTEM' => 1,
-+ 'AM_CONDITIONAL' => 1,
+ 'AC_CONFIG_HEADERS' => 1,
+ 'AC_DEFINE_TRACE_LITERAL' => 1,
+ 'm4_include' => 1,
@@ -16603,10 +16523,10 @@
+ ], 'Autom4te::Request' )
+ );
+
-diff -urNad lustre-1.6.2~/autom4te.cache/traces.0 lustre-1.6.2/autom4te.cache/traces.0
---- lustre-1.6.2~/autom4te.cache/traces.0 1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.6.2/autom4te.cache/traces.0 2007-09-06 14:19:04.829073322 +0200
-@@ -0,0 +1,1770 @@
+diff -Nurwd orig/lustre-1.6.2/autom4te.cache/traces.0 lustre-1.6.2/autom4te.cache/traces.0
+--- orig/lustre-1.6.2/autom4te.cache/traces.0 1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.6.2/autom4te.cache/traces.0 2007-09-14 13:58:29.000000000 +0200
+@@ -0,0 +1,1777 @@
+m4trace:aclocal.m4:4168: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
+m4trace:configure.ac:2: -1- AC_INIT([Lustre], [LUSTRE_VERSION], [https://bugzilla.lustre.org/], [lustre])
+m4trace:configure.ac:2: -1- m4_pattern_forbid([^_?A[CHUM]_])
@@ -17049,6 +16969,13 @@
+m4trace:configure.ac:16: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_LONG_LONG$])
+m4trace:configure.ac:16: -1- AH_OUTPUT([SIZEOF_UNSIGNED_LONG_LONG], [/* The size of `unsigned long long\', as computed by sizeof. */
+#undef SIZEOF_UNSIGNED_LONG_LONG])
++m4trace:configure.ac:16: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from...
++../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from...
++../../lib/autoconf/general.m4:2530: AC_CHECK_DECL is expanded from...
++aclocal.m4:444: LB_PROG_CC is expanded from...
++aclocal.m4:568: LB_CONFIGURE is expanded from...
++configure.ac:16: the top level])
+m4trace:configure.ac:16: -1- AC_SUBST([LLCPPFLAGS])
+m4trace:configure.ac:16: -1- AC_SUBST_TRACE([LLCPPFLAGS])
+m4trace:configure.ac:16: -1- m4_pattern_allow([^LLCPPFLAGS$])
@@ -18377,9 +18304,153 @@
+m4trace:configure.ac:16: -1- AC_SUBST_TRACE([abs_builddir])
+m4trace:configure.ac:16: -1- AC_SUBST_TRACE([abs_top_builddir])
+m4trace:configure.ac:16: -1- AC_SUBST_TRACE([INSTALL])
-diff -urNad lustre-1.6.2~/config.h.in lustre-1.6.2/config.h.in
---- lustre-1.6.2~/config.h.in 2007-08-30 00:29:37.000000000 +0200
-+++ lustre-1.6.2/config.h.in 2007-09-06 14:18:09.518511295 +0200
+diff -Nurwd orig/lustre-1.6.2/autoMakefile.in lustre-1.6.2/autoMakefile.in
+--- orig/lustre-1.6.2/autoMakefile.in 2007-08-30 00:29:50.000000000 +0200
++++ lustre-1.6.2/autoMakefile.in 2007-09-14 13:58:30.000000000 +0200
+@@ -1,4 +1,4 @@
+-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
++# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
+ # @configure_input@
+
+ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+@@ -115,12 +115,11 @@
+ EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
+ EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
+ EXTRA_KCFLAGS = @EXTRA_KCFLAGS@
+-EXTRA_KLDFLAGS = @EXTRA_KLDFLAGS@
+-EXTRA_KLIBS = @EXTRA_KLIBS@
+ EXTRA_LNET_INCLUDE = @EXTRA_LNET_INCLUDE@
+ GMCPPFLAGS = @GMCPPFLAGS@
+ GMLIBS = @GMLIBS@
+ GMLND = @GMLND@
++GREP = @GREP@
+ IIBCPPFLAGS = @IIBCPPFLAGS@
+ IIBLND = @IIBLND@
+ INCLUDE_RULES = @INCLUDE_RULES@
+@@ -216,8 +215,6 @@
+ VIBLND = @VIBLND@
+ ac_configure_args = @ac_configure_args@
+ ac_ct_CC = @ac_ct_CC@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ agentdir = @agentdir@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+@@ -231,34 +228,37 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ demodir = @demodir@
+ docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-kextdir = @kextdir@
+ lb_target_os = @lb_target_os@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+ linux25 = @linux25@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+-macosdir = @macosdir@
+ mandir = @mandir@
+ mibdir = @mibdir@
+ moduledir = @moduledir@
+ modulefsdir = @modulefsdir@
+ modulenetdir = @modulenetdir@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pkgexampledir = @pkgexampledir@
+-plistdir = @plistdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ rootsbindir = @rootsbindir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+@@ -301,6 +301,8 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = config.h
+ CONFIG_CLEAN_FILES = Makefile Rules lustre.spec \
++ lnet/include/libcfs/darwin/Makefile \
++ lnet/include/lnet/darwin/Makefile lnet/libcfs/darwin/Makefile \
+ lustre/kernel_patches/targets/2.6-suse.target \
+ lustre/kernel_patches/targets/2.6-vanilla.target \
+ lustre/kernel_patches/targets/2.6-rhel4.target \
+@@ -312,7 +314,8 @@
+ lustre/kernel_patches/targets/rh-2.4.target \
+ lustre/kernel_patches/targets/rhel-2.4.target \
+ lustre/kernel_patches/targets/suse-2.4.21-2.target \
+- lustre/kernel_patches/targets/sles-2.4.target
++ lustre/kernel_patches/targets/sles-2.4.target \
++ lustre/obdclass/darwin/Makefile
+ DIST_SOURCES =
+
+ RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+@@ -323,8 +326,9 @@
+ DIST_COMMON = README $(srcdir)/autoMakefile.in \
+ $(srcdir)/build/autoMakefile.am.toplevel $(srcdir)/configure \
+ COPYING ChangeLog Makefile.in aclocal.m4 autoMakefile.am \
+- compile config.guess config.h.in config.sub configure.ac \
+- depcomp install-sh lustre.spec.in missing mkinstalldirs
++ compile config.guess config.h.in config.sub configure \
++ configure.ac depcomp install-sh lustre.spec.in missing \
++ mkinstalldirs
+ all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+@@ -368,6 +372,12 @@
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+ lustre.spec: $(top_builddir)/config.status lustre.spec.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
++lnet/include/libcfs/darwin/Makefile: $(top_builddir)/config.status $(top_srcdir)/lnet/include/libcfs/darwin/Makefile.in
++ cd $(top_builddir) && $(SHELL) ./config.status $@
++lnet/include/lnet/darwin/Makefile: $(top_builddir)/config.status $(top_srcdir)/lnet/include/lnet/darwin/Makefile.in
++ cd $(top_builddir) && $(SHELL) ./config.status $@
++lnet/libcfs/darwin/Makefile: $(top_builddir)/config.status $(top_srcdir)/lnet/libcfs/darwin/Makefile.in
++ cd $(top_builddir) && $(SHELL) ./config.status $@
+ lustre/kernel_patches/targets/2.6-suse.target: $(top_builddir)/config.status $(top_srcdir)/lustre/kernel_patches/targets/2.6-suse.target.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+ lustre/kernel_patches/targets/2.6-vanilla.target: $(top_builddir)/config.status $(top_srcdir)/lustre/kernel_patches/targets/2.6-vanilla.target.in
+@@ -392,6 +402,8 @@
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+ lustre/kernel_patches/targets/sles-2.4.target: $(top_builddir)/config.status $(top_srcdir)/lustre/kernel_patches/targets/sles-2.4.target.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
++lustre/obdclass/darwin/Makefile: $(top_builddir)/config.status $(top_srcdir)/lustre/obdclass/darwin/Makefile.in
++ cd $(top_builddir) && $(SHELL) ./config.status $@
+ uninstall-info-am:
+
+ # This directory's subdirectories are mostly independent; you can cd
+@@ -507,7 +519,7 @@
+ distdir: $(DISTFILES)
+ $(am__remove_distdir)
+ mkdir $(distdir)
+- $(mkinstalldirs) $(distdir)/. $(distdir)/./build $(distdir)/build $(distdir)/build/autoconf $(distdir)/lnet $(distdir)/lnet/klnds $(distdir)/lnet/klnds/ciblnd $(distdir)/lnet/klnds/gmlnd $(distdir)/lnet/klnds/iiblnd $(distdir)/lnet/klnds/mxlnd $(distdir)/lnet/klnds/o2iblnd $(distdir)/lnet/klnds/openiblnd $(distdir)/lnet/klnds/ptllnd $(distdir)/lnet/klnds/qswlnd $(distdir)/lnet/klnds/ralnd $(distdir)/lnet/klnds/socklnd $(distdir)/lnet/klnds/viblnd $(distdir)/lnet/libcfs $(distdir)/lnet/lnet $(distdir)/lnet/selftest $(distdir)/lnet/ulnds $(distdir)/lustre $(distdir)/lustre/include $(distdir)/lustre/kernel_patches/targets $(distdir)/lustre/llite $(distdir)/lustre/lov $(distdir)/lustre/lvfs $(distdir)/lustre/mdc $(distdir)/lustre/mds $(distdir)/lustre/mgc $(distdir)/lustre/mgs $(distdir)/lustre/obdclass $(distdir)/lustre/obdecho $(distdir)/lustre/obdfilter $(distdir)/lustre/osc $(distdir)/lustre/ost $(distdir)/lustre/ptlrpc $(distdir)/lustre/quota $(distdir)/lustre/scripts
++ $(mkinstalldirs) $(distdir)/. $(distdir)/./build $(distdir)/build $(distdir)/build/autoconf $(distdir)/lnet $(distdir)/lnet/include/libcfs/darwin $(distdir)/lnet/include/lnet/darwin $(distdir)/lnet/klnds $(distdir)/lnet/klnds/ciblnd $(distdir)/lnet/klnds/gmlnd $(distdir)/lnet/klnds/iiblnd $(distdir)/lnet/klnds/mxlnd $(distdir)/lnet/klnds/o2iblnd $(distdir)/lnet/klnds/openiblnd $(distdir)/lnet/klnds/ptllnd $(distdir)/lnet/klnds/qswlnd $(distdir)/lnet/klnds/ralnd $(distdir)/lnet/klnds/socklnd $(distdir)/lnet/klnds/viblnd $(distdir)/lnet/libcfs $(distdir)/lnet/libcfs/darwin $(distdir)/lnet/lnet $(distdir)/lnet/selftest $(distdir)/lnet/ulnds $(distdir)/lustre $(distdir)/lustre/include $(distdir)/lustre/kernel_patches/targets $(distdir)/lustre/llite $(distdir)/lustre/lov $(distdir)/lustre/lvfs $(distdir)/lustre/mdc $(distdir)/lustre/mds $(distdir)/lustre/mgc $(distdir)/lustre/mgs $(distdir)/lustre/obdclass $(distdir)/lustre/obdclass/darwin $(distdir)/lustre/obdecho $(distdir)/lustre/obdfilter $(distdir)/lustre/osc $(distdir)/lustre/ost $(distdir)/lustre/ptlrpc $(distdir)/lustre/quota $(distdir)/lustre/scripts
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+@@ -636,7 +648,7 @@
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- INSTALL_STRIP_FLAG=-s \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ mostlyclean-generic:
+diff -Nurwd orig/lustre-1.6.2/config.h.in lustre-1.6.2/config.h.in
+--- orig/lustre-1.6.2/config.h.in 2007-08-30 00:29:37.000000000 +0200
++++ lustre-1.6.2/config.h.in 2007-09-14 13:50:45.000000000 +0200
@@ -138,9 +138,6 @@
/* Define to 1 if you have the `gethostbyname' function. */
#undef HAVE_GETHOSTBYNAME
@@ -18399,9 +18470,9 @@
#undef SIZEOF_UNSIGNED_LONG_LONG
/* use tunable backoff TCP */
-diff -urNad lustre-1.6.2~/configure lustre-1.6.2/configure
---- lustre-1.6.2~/configure 2007-08-30 00:30:00.000000000 +0200
-+++ lustre-1.6.2/configure 2007-09-06 14:19:12.269938172 +0200
+diff -Nurwd orig/lustre-1.6.2/configure lustre-1.6.2/configure
+--- orig/lustre-1.6.2/configure 2007-08-30 00:30:00.000000000 +0200
++++ lustre-1.6.2/configure 2007-09-14 13:58:37.000000000 +0200
@@ -1,27 +1,56 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -18548,7 +18619,6 @@
- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
- /^X\/\(\/\/\)$/{ s//\1/; q; }
- /^X\/\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
@@ -18561,7 +18631,7 @@
+ s//\1/
+ q
+ }
-+ s/.*/./; q'`
+ s/.*/./; q'`
+# CDPATH.
+$as_unset CDPATH
@@ -18581,17 +18651,15 @@
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
-- else
-- PATH_SEPARATOR=:
-- fi
-- rm -f conf$$.sh
+if test "x$CONFIG_SHELL" = x; then
+ if (eval ":") 2>/dev/null; then
+ as_have_required=yes
-+else
+ else
+- PATH_SEPARATOR=:
+ as_have_required=no
- fi
-
+ fi
+- rm -f conf$$.sh
++
+ if test $as_have_required = yes && (eval ":
+(as_func_return () {
+ (exit \$1)
@@ -18608,6 +18676,19 @@
+as_func_ret_failure () {
+ return 1
+}
++
++exitcode=0
++if as_func_success; then
++ :
++else
++ exitcode=1
++ echo as_func_success failed.
+ fi
+
++if as_func_failure; then
++ exitcode=1
++ echo as_func_failure succeeded.
++fi
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
@@ -18625,12 +18706,11 @@
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-+exitcode=0
-+if as_func_success; then
++if as_func_ret_success; then
+ :
+else
+ exitcode=1
-+ echo as_func_success failed.
++ echo as_func_ret_success failed.
+fi
- ;;
@@ -18639,36 +18719,22 @@
- # in which case we are not to be found in the path.
- if test "x$as_myself" = x; then
- as_myself=$0
-- fi
++if as_func_ret_failure; then
++ exitcode=1
++ echo as_func_ret_failure succeeded.
+ fi
- if test ! -f "$as_myself"; then
- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
- { (exit 1); exit 1; }; }
-- fi
++
++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
++ :
++else
++ exitcode=1
++ echo positional parameters were not saved.
+ fi
- case $CONFIG_SHELL in
- '')
-+if as_func_failure; then
-+ exitcode=1
-+ echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+ exitcode=1
-+ echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+ :
-+else
-+ exitcode=1
-+ echo positional parameters were not saved.
-+fi
+
+test \$exitcode = 0) || { (exit 1); exit 1; }
+
@@ -18687,8 +18753,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for as_base in sh bash ksh sh5; do
-- case $as_dir in
-+ case $as_dir in
+ case $as_dir in
/*)
- if ("$as_dir/$as_base" -c '
+ for as_base in sh bash ksh sh5; do
@@ -18803,10 +18868,6 @@
- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
- fi;;
- esac
-- done
--done
--;;
-- esac
+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+
+_ASEOF
@@ -18816,12 +18877,14 @@
+
+fi
+
-+ done
+ done
+
+ if test "x$CONFIG_SHELL" != x; then
+ for as_var in BASH_ENV ENV
+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+ done
+ done
+-;;
+- esac
+ export CONFIG_SHELL
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
@@ -18931,9 +18994,8 @@
+ :lineno
N
- s,$,-,
-- : loop
+ : loop
- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+ :loop
+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
t loop
- s,-$,,
@@ -18999,16 +19061,16 @@
- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
- if test -f conf$$.exe; then
- # Don't use ln at all; we don't have any links
-+ as_ln_s='ln -s'
+- as_ln_s='cp -p'
+- else
+ as_ln_s='ln -s'
+- fi
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
-- else
-- as_ln_s='ln -s'
-- fi
++ as_ln_s='cp -p'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
@@ -19133,12 +19195,11 @@
-#else
-# if HAVE_STDINT_H
-# include <stdint.h>
--# endif
+ # endif
++#ifdef HAVE_STDINT_H
++# include <stdint.h>
#endif
-#if HAVE_UNISTD_H
-+#ifdef HAVE_STDINT_H
-+# include <stdint.h>
-+#endif
+#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif"
@@ -19667,7 +19728,6 @@
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
@@ -19684,7 +19744,7 @@
+ s//\1/
+ q
+ }
-+ s/.*/./; q'`
+ s/.*/./; q'`
srcdir=$ac_confdir
- if test ! -r $srcdir/$ac_unique_file; then
+ if test ! -r "$srcdir/$ac_unique_file"; then
@@ -19698,13 +19758,12 @@
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
- { (exit 1); exit 1; }; }
- else
-- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+if test ! -r "$srcdir/$ac_unique_file"; then
+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
{ (exit 1); exit 1; }; }
-- fi
- fi
+ fi
+-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
@@ -20115,7 +20174,7 @@
done | sort
echo
fi
-@@ -1219,26 +1783,24 @@
+@@ -1219,15 +1783,15 @@
## ----------- ##
_ASBOX
echo
@@ -20132,11 +20191,9 @@
+ rm -f core *.core core.conftest.* &&
+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
exit $exit_status
-- ' 0
-+' 0
+ ' 0
for ac_signal in 1 2 13 15; do
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
- done
+@@ -1236,9 +1800,7 @@
ac_signal=0
# confdefs.h avoids OS command line length limits that DEFS can exceed.
@@ -20154,14 +20211,13 @@
-if test -z "$CONFIG_SITE"; then
- if test "x$prefix" != xNONE; then
- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-- else
-- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-- fi
+if test -n "$CONFIG_SITE"; then
+ set x "$CONFIG_SITE"
+elif test "x$prefix" != xNONE; then
+ set x "$prefix/share/config.site" "$prefix/etc/config.site"
-+else
+ else
+- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+- fi
+ set x "$ac_default_prefix/share/config.site" \
+ "$ac_default_prefix/etc/config.site"
fi
@@ -20699,7 +20755,6 @@
+echo "${ECHO_T}no" >&6; }
fi
-- STRIP=$ac_ct_STRIP
+ if test "x$ac_ct_STRIP" = x; then
+ STRIP=":"
+ else
@@ -20713,7 +20768,7 @@
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
-+ STRIP=$ac_ct_STRIP
+ STRIP=$ac_ct_STRIP
+ fi
else
STRIP="$ac_cv_prog_STRIP"
@@ -20771,7 +20826,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -1974,36 +2608,51 @@
+@@ -1974,26 +2608,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -20800,7 +20855,6 @@
+echo "${ECHO_T}no" >&6; }
fi
-- CC=$ac_ct_CC
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
@@ -20814,17 +20868,14 @@
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
-+ CC=$ac_ct_CC
+ CC=$ac_ct_CC
+ fi
else
CC="$ac_cv_prog_CC"
fi
-
- if test -z "$CC"; then
-- if test -n "$ac_tool_prefix"; then
-- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-+ if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+@@ -2002,8 +2651,8 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
@@ -20858,11 +20909,11 @@
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
--fi
--
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
+
+-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "cc", so it can be a program name with args.
@@ -20889,8 +20940,8 @@
-done
-done
--fi
--fi
+ fi
+ fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
@@ -20904,9 +20955,8 @@
-else
- CC="$ac_cv_prog_CC"
-fi
-
-+ fi
- fi
+-
+-fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -21012,7 +21062,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2195,29 +2808,45 @@
+@@ -2195,30 +2808,46 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -21045,7 +21095,6 @@
test -n "$ac_ct_CC" && break
done
-- CC=$ac_ct_CC
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
@@ -21059,11 +21108,12 @@
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
-+ CC=$ac_ct_CC
-+ fi
+ CC=$ac_ct_CC
fi
++fi
fi
+
@@ -2230,21 +2859,35 @@
{ (exit 1); exit 1; }; }
@@ -21177,14 +21227,13 @@
# certainly right.
break;;
*.* )
-- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
++ then :; else
+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- # FIXME: I believe we export ac_cv_exeext for Libtool,
- # but it would be cool to find out if it's true. Does anybody
- # maintain Libtool? --akim.
- export ac_cv_exeext
-+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-+ then :; else
-+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ fi
+ # We set ac_cv_exeext here because the later test for it is not
+ # safe: cross compilers may not add the suffix if given an `-o'
@@ -21348,7 +21397,7 @@
if test "${ac_cv_c_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2474,50 +3159,49 @@
+@@ -2474,27 +3159,22 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -21387,10 +21436,9 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_compiler_gnu=no
-+ ac_compiler_gnu=no
+@@ -2502,21 +3182,25 @@
+
+ ac_compiler_gnu=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
@@ -21413,15 +21461,13 @@
if test "${ac_cv_prog_cc_g+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- cat >conftest.$ac_ext <<_ACEOF
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
-+ cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
- cat confdefs.h >>conftest.$ac_ext
@@ -2533,38 +3217,118 @@
}
_ACEOF
@@ -21830,15 +21876,6 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -2845,7 +3466,7 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- DEPDIR="${am__leading_dot}deps"
-
-- ac_config_commands="$ac_config_commands depfiles"
-+ac_config_commands="$ac_config_commands depfiles"
-
-
- am_make=${MAKE-make}
@@ -2855,8 +3476,8 @@
.PHONY: am__doit
END
@@ -22168,25 +22205,25 @@
+IFS=$as_save_IFS
+
+
-+fi
-+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
+
+GREP="$ac_cv_path_GREP"
+if test -z "$GREP"; then
+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
+fi
-+
-+else
-+ ac_cv_path_GREP=$GREP
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
-
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
++else
++ ac_cv_path_GREP=$GREP
++fi
++
++
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
@@ -22281,7 +22318,7 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3288,35 +4052,31 @@
+@@ -3288,27 +4052,22 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -22320,10 +22357,9 @@
ac_cv_header_stdc=yes
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_header_stdc=no
-+ ac_cv_header_stdc=no
+@@ -3316,7 +4075,8 @@
+
+ ac_cv_header_stdc=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
@@ -22404,7 +22440,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -3459,38 +4231,35 @@
+@@ -3459,27 +4231,22 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -22443,10 +22479,9 @@
eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_Header=no"
-+ eval "$as_ac_Header=no"
+@@ -3487,10 +4254,12 @@
+
+ eval "$as_ac_Header=no"
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
@@ -22595,7 +22630,6 @@
+echo "${ECHO_T}no" >&6; }
fi
-- RANLIB=$ac_ct_RANLIB
+ if test "x$ac_ct_RANLIB" = x; then
+ RANLIB=":"
+ else
@@ -22609,7 +22643,7 @@
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
-+ RANLIB=$ac_ct_RANLIB
+ RANLIB=$ac_ct_RANLIB
+ fi
else
RANLIB="$ac_cv_prog_RANLIB"
@@ -22647,7 +22681,7 @@
if test "${ac_cv_type_unsigned_long_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3716,61 +4501,57 @@
+@@ -3716,39 +4501,35 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -22701,10 +22735,9 @@
ac_cv_type_unsigned_long_long=yes
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_type_unsigned_long_long=no
-+ ac_cv_type_unsigned_long_long=no
+@@ -3756,21 +4537,21 @@
+
+ ac_cv_type_unsigned_long_long=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
@@ -22717,20 +22750,20 @@
-echo "$as_me:$LINENO: checking size of unsigned long long" >&5
-echo $ECHO_N "checking size of unsigned long long... $ECHO_C" >&6
+-if test "${ac_cv_sizeof_unsigned_long_long+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test "$ac_cv_type_unsigned_long_long" = yes; then
+- # The cast to unsigned long works around a bug in the HP C Compiler
+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of unsigned long long" >&5
+echo $ECHO_N "checking size of unsigned long long... $ECHO_C" >&6; }
- if test "${ac_cv_sizeof_unsigned_long_long+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- if test "$ac_cv_type_unsigned_long_long" = yes; then
-- # The cast to unsigned long works around a bug in the HP C Compiler
-- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-- # This bug is HP SR number 8606223364.
++if test "${ac_cv_sizeof_unsigned_long_long+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
@@ -22799,7 +22832,7 @@
test_array [0] = 0
;
-@@ -3832,56 +4610,53 @@
+@@ -3832,27 +4610,22 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -22838,20 +22871,9 @@
ac_hi=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_lo=`expr $ac_mid + 1`
-- if test $ac_lo -le $ac_mid; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid + 1`
-+ ac_lo=`expr $ac_mid + 1`
-+ if test $ac_lo -le $ac_mid; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid + 1`
+@@ -3865,7 +4638,8 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
@@ -22859,13 +22881,7 @@
done
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--cat >conftest.$ac_ext <<_ACEOF
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
+@@ -3878,10 +4652,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -22930,7 +22946,7 @@
test_array [0] = 0
;
-@@ -3930,50 +4701,48 @@
+@@ -3930,27 +4701,22 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -22969,20 +22985,9 @@
ac_lo=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_hi=`expr '(' $ac_mid ')' - 1`
-- if test $ac_mid -le $ac_hi; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid`
-+ ac_hi=`expr '(' $ac_mid ')' - 1`
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid`
+@@ -3963,7 +4729,8 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
@@ -22990,10 +22995,9 @@
done
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_lo= ac_hi=
-+ ac_lo= ac_hi=
+@@ -3971,9 +4738,11 @@
+
+ ac_lo= ac_hi=
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
@@ -23018,7 +23022,7 @@
test_array [0] = 0
;
-@@ -3995,52 +4765,45 @@
+@@ -3995,27 +4765,22 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -23057,10 +23061,9 @@
ac_hi=$ac_mid
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_lo=`expr '(' $ac_mid ')' + 1`
-+ ac_lo=`expr '(' $ac_mid ')' + 1`
+@@ -4023,23 +4788,21 @@
+
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
@@ -23076,11 +23079,8 @@
+echo "$as_me: error: cannot compute sizeof (unsigned long long)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
+-esac
+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_unsigned_long_long=0
-+ fi ;;
- esac
else
- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
@@ -23088,10 +23088,12 @@
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
--else
++ ac_cv_sizeof_unsigned_long_long=0
++ fi ;;
++esac
+ else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
- _ACEOF
@@ -4048,8 +4811,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -23174,20 +23176,19 @@
+echo "$as_me: error: cannot compute sizeof (unsigned long long)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
+ else
+ ac_cv_sizeof_unsigned_long_long=0
-+ fi
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
-else
- ac_cv_sizeof_unsigned_long_long=0
+ fi
-fi
- fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_unsigned_long_long" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long_long" >&5
@@ -23198,41 +23199,44 @@
cat >>confdefs.h <<_ACEOF
#define SIZEOF_UNSIGNED_LONG_LONG $ac_cv_sizeof_unsigned_long_long
_ACEOF
-@@ -4127,129 +4903,21 @@
+@@ -4127,8 +4903,8 @@
fi
# FIXME
-echo "$as_me:$LINENO: checking whether __i386__ is declared" >&5
-echo $ECHO_N "checking whether __i386__ is declared... $ECHO_C" >&6
--if test "${ac_cv_have_decl___i386__+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
--#ifndef __i386__
++{ echo "$as_me:$LINENO: checking whether __i386__ is declared" >&5
++echo $ECHO_N "checking whether __i386__ is declared... $ECHO_C" >&6; }
+ if test "${ac_cv_have_decl___i386__+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -4143,7 +4919,7 @@
+ main ()
+ {
+ #ifndef __i386__
- char *p = (char *) __i386__;
--#endif
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
++ (void) __i386__;
+ #endif
+
+ ;
+@@ -4151,27 +4927,22 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
@@ -23247,50 +23251,56 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_have_decl___i386__=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_have_decl___i386__=no
--fi
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ ac_cv_have_decl___i386__=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -4179,18 +4950,19 @@
+
+ ac_cv_have_decl___i386__=no
+ fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
-echo "$as_me:$LINENO: result: $ac_cv_have_decl___i386__" >&5
-echo "${ECHO_T}$ac_cv_have_decl___i386__" >&6
--if test $ac_cv_have_decl___i386__ = yes; then
-- :
--else
--
--
--if test x$enable_bgl != xyes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_have_decl___i386__" >&5
++echo "${ECHO_T}$ac_cv_have_decl___i386__" >&6; }
+ if test $ac_cv_have_decl___i386__ = yes; then
+ :
+ else
+
+
+ if test x$enable_bgl != xyes; then
-echo "$as_me:$LINENO: checking if $CC accepts -m64" >&5
-echo $ECHO_N "checking if $CC accepts -m64... $ECHO_C" >&6
--CC_save="$CC"
--CC="$CC -m64"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
++{ echo "$as_me:$LINENO: checking if $CC accepts -m64" >&5
++echo $ECHO_N "checking if $CC accepts -m64... $ECHO_C" >&6; }
+ CC_save="$CC"
+ CC="$CC -m64"
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -4209,42 +4981,38 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
@@ -23305,45 +23315,35 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
--
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
--
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-- CC="$CC_save"
--
--fi
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ CC="$CC_save"
+
+ fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--
--
--fi
--
-+#AC_CHECK_DECL([__i386__], [], [
-+#
-+#if test x$enable_bgl != xyes; then
-+#AC_MSG_CHECKING([if $CC accepts -m64])
-+#CC_save="$CC"
-+#CC="$CC -m64"
-+#AC_TRY_COMPILE([],[],[
-+# AC_MSG_RESULT([yes])
-+#],[
-+# AC_MSG_RESULT([no])
-+# CC="$CC_save"
-+#])
-+#fi
-+#
-+#])
-
- CPPFLAGS="-I\$(top_builddir)/lnet/include -I\$(top_srcdir)/lnet/include -I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS"
-
-@@ -4264,12 +4932,11 @@
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+
+
+@@ -4264,12 +5032,11 @@
@@ -23360,7 +23360,7 @@
if test x$enable_doc = xyes ; then
ENABLE_DOC=1
else
-@@ -4281,94 +4948,95 @@
+@@ -4281,94 +5048,95 @@
ENABLE_DOC=0
enable_doc='no'
@@ -23505,7 +23505,7 @@
if test x$enable_libcfs_cdebug = xyes; then
cat >>confdefs.h <<\_ACEOF
-@@ -4383,17 +5051,17 @@
+@@ -4383,17 +5151,17 @@
fi
@@ -23531,7 +23531,7 @@
if test x$enable_libcfs_trace = xyes; then
cat >>confdefs.h <<\_ACEOF
-@@ -4408,17 +5076,17 @@
+@@ -4408,17 +5176,17 @@
fi
@@ -23557,7 +23557,7 @@
if test x$enable_libcfs_assert = xyes; then
cat >>confdefs.h <<\_ACEOF
-@@ -4428,12 +5096,11 @@
+@@ -4428,12 +5196,11 @@
fi
@@ -23574,7 +23574,7 @@
else
case $target_os in
-@@ -4450,32 +5117,33 @@
+@@ -4450,32 +5217,33 @@
esac
@@ -23622,7 +23622,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -r "$LINUX"; then
-@@ -4484,8 +5152,9 @@
+@@ -4484,8 +5252,9 @@
eval "$as_lb_File=no"
fi
fi
@@ -23634,7 +23634,7 @@
if test `eval echo '${'$as_lb_File'}'` = yes; then
:
else
-@@ -4496,33 +5165,33 @@
+@@ -4496,33 +5265,33 @@
# -------- linux objects (for 2.6) --
@@ -23682,7 +23682,7 @@
if test "${lb_cv_file__boot_kernel_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4532,13 +5201,13 @@
+@@ -4532,13 +5301,13 @@
lb_cv_file__boot_kernel_h=no
fi
fi
@@ -23700,7 +23700,7 @@
if test "${lb_cv_file__var_adm_running_kernel_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4548,8 +5217,8 @@
+@@ -4548,8 +5317,8 @@
lb_cv_file__var_adm_running_kernel_h=no
fi
fi
@@ -23711,7 +23711,7 @@
if test $lb_cv_file__var_adm_running_kernel_h = yes; then
KERNEL_SOURCE_HEADER='/var/adm/running-kernel.h'
fi
-@@ -4558,17 +5227,17 @@
+@@ -4558,17 +5327,17 @@
@@ -23736,7 +23736,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -r "$LINUX_CONFIG"; then
-@@ -4577,8 +5246,9 @@
+@@ -4577,8 +5346,9 @@
eval "$as_lb_File=no"
fi
fi
@@ -23748,7 +23748,7 @@
if test `eval echo '${'$as_lb_File'}'` = yes; then
:
else
-@@ -4593,9 +5263,9 @@
+@@ -4593,9 +5363,9 @@
# and at more old has only one line
# include <autoconf.h>
as_lb_File=`echo "lb_cv_file_$LINUX_OBJ/include/linux/autoconf.h" | $as_tr_sh`
@@ -23761,7 +23761,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -r "$LINUX_OBJ/include/linux/autoconf.h"; then
-@@ -4604,8 +5274,9 @@
+@@ -4604,8 +5374,9 @@
eval "$as_lb_File=no"
fi
fi
@@ -23773,7 +23773,7 @@
if test `eval echo '${'$as_lb_File'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -4619,9 +5290,9 @@
+@@ -4619,9 +5390,9 @@
{ (exit 1); exit 1; }; }
fi
as_lb_File=`echo "lb_cv_file_$LINUX_OBJ/include/linux/version.h" | $as_tr_sh`
@@ -23786,7 +23786,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -r "$LINUX_OBJ/include/linux/version.h"; then
-@@ -4630,8 +5301,9 @@
+@@ -4630,8 +5401,9 @@
eval "$as_lb_File=no"
fi
fi
@@ -23798,7 +23798,7 @@
if test `eval echo '${'$as_lb_File'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -4658,9 +5330,9 @@
+@@ -4658,9 +5430,9 @@
# enable extensive workarounds to get this to build
# modules
as_lb_File=`echo "lb_cv_file_$KERNEL_SOURCE_HEADER" | $as_tr_sh`
@@ -23811,7 +23811,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -r "$KERNEL_SOURCE_HEADER"; then
-@@ -4669,8 +5341,9 @@
+@@ -4669,8 +5441,9 @@
eval "$as_lb_File=no"
fi
fi
@@ -23823,7 +23823,7 @@
if test `eval echo '${'$as_lb_File'}'` = yes; then
if test $KERNEL_SOURCE_HEADER = '/boot/kernel.h' ; then
{ echo "$as_me:$LINENO: WARNING: Using /boot/kernel.h from RUNNING kernel." >&5
-@@ -4693,30 +5366,30 @@
+@@ -4693,30 +5466,30 @@
ARCH_UM=
UML_CFLAGS=
@@ -23865,7 +23865,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -r "$LINUX/include/linux/namei.h"; then
-@@ -4725,8 +5398,9 @@
+@@ -4725,8 +5498,9 @@
eval "$as_lb_File=no"
fi
fi
@@ -23877,7 +23877,7 @@
if test `eval echo '${'$as_lb_File'}'` = yes; then
linux25="yes"
-@@ -4739,16 +5413,16 @@
+@@ -4739,16 +5513,16 @@
fi
@@ -23900,7 +23900,7 @@
rm -f build/conftest.i
cat >conftest.c <<_ACEOF
/* confdefs.h. */
-@@ -4779,8 +5453,8 @@
+@@ -4779,8 +5553,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -23911,7 +23911,7 @@
else
echo "$as_me: failed program was:" >&5
-@@ -4818,8 +5492,8 @@
+@@ -4818,8 +5592,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -23922,7 +23922,7 @@
else
echo "$as_me: failed program was:" >&5
-@@ -4845,8 +5519,8 @@
+@@ -4845,8 +5619,8 @@
# --- check that we can build modules at all
@@ -23933,7 +23933,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -4876,16 +5550,16 @@
+@@ -4876,16 +5650,16 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -23954,7 +23954,7 @@
{ echo "$as_me:$LINENO: WARNING: Consult config.log for details." >&5
echo "$as_me: WARNING: Consult config.log for details." >&2;}
{ echo "$as_me:$LINENO: WARNING: If you are trying to build with a kernel-source rpm, consult build/README.kernel-source" >&5
-@@ -4899,8 +5573,8 @@
+@@ -4899,8 +5673,8 @@
LINUXRELEASE=
rm -f build/conftest.i
@@ -23965,7 +23965,7 @@
if test -s $LINUX_OBJ/include/linux/utsrelease.h ; then
LINUXRELEASEHEADER=utsrelease.h
else
-@@ -4952,8 +5626,8 @@
+@@ -4952,8 +5726,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23976,7 +23976,7 @@
{ { echo "$as_me:$LINENO: error: Could not preprocess test program. Consult config.log for details." >&5
echo "$as_me: error: Could not preprocess test program. Consult config.log for details." >&2;}
{ (exit 1); exit 1; }; }
-@@ -4962,14 +5636,14 @@
+@@ -4962,14 +5736,14 @@
rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
rm -f build/conftest.i
if test x$LINUXRELEASE = x ; then
@@ -23995,7 +23995,7 @@
moduledir='/lib/modules/'$LINUXRELEASE/kernel
-@@ -4982,17 +5656,17 @@
+@@ -4982,17 +5756,17 @@
# ------------ RELEASE --------------------------------
@@ -24019,7 +24019,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -5030,8 +5704,8 @@
+@@ -5030,8 +5804,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -24030,7 +24030,7 @@
else
-@@ -5039,8 +5713,8 @@
+@@ -5039,8 +5813,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24041,7 +24041,7 @@
{ { echo "$as_me:$LINENO: error: module support is required to build Lustre kernel modules." >&5
echo "$as_me: error: module support is required to build Lustre kernel modules." >&2;}
-@@ -5051,8 +5725,8 @@
+@@ -5051,8 +5825,8 @@
rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
@@ -24052,7 +24052,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -5090,8 +5764,8 @@
+@@ -5090,8 +5864,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -24063,7 +24063,7 @@
else
-@@ -5099,16 +5773,16 @@
+@@ -5099,16 +5873,16 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24084,7 +24084,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -5146,8 +5820,8 @@
+@@ -5146,8 +5920,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -24095,7 +24095,7 @@
{ { echo "$as_me:$LINENO: error: Lustre does not support kernels with preempt enabled." >&5
echo "$as_me: error: Lustre does not support kernels with preempt enabled." >&2;}
-@@ -5159,16 +5833,16 @@
+@@ -5159,16 +5933,16 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24116,7 +24116,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -5206,8 +5880,8 @@
+@@ -5206,8 +5980,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -24127,7 +24127,7 @@
else
-@@ -5215,8 +5889,8 @@
+@@ -5215,8 +5989,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24138,7 +24138,7 @@
if test "x$ARCH_UM" = "x" ; then
{ { echo "$as_me:$LINENO: error: Lustre requires that CONFIG_KALLSYMS is enabled in your kernel." >&5
-@@ -5229,8 +5903,8 @@
+@@ -5229,8 +6003,8 @@
rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
@@ -24149,7 +24149,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -5268,8 +5942,8 @@
+@@ -5268,8 +6042,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -24160,7 +24160,7 @@
else
-@@ -5277,8 +5951,8 @@
+@@ -5277,8 +6051,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24171,7 +24171,7 @@
{ echo "$as_me:$LINENO: WARNING: " >&5
echo "$as_me: WARNING: " >&2;}
-@@ -5296,8 +5970,8 @@
+@@ -5296,8 +6070,8 @@
@@ -24182,7 +24182,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -5331,8 +6005,8 @@
+@@ -5331,8 +6105,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -24193,7 +24193,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_CPU_ONLINE 1
-@@ -5344,14 +6018,14 @@
+@@ -5344,14 +6118,14 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24212,7 +24212,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -5385,8 +6059,8 @@
+@@ -5385,8 +6159,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -24223,7 +24223,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_GFP_T 1
-@@ -5398,14 +6072,14 @@
+@@ -5398,14 +6172,14 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24242,7 +24242,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -5439,8 +6113,8 @@
+@@ -5439,8 +6213,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -24253,7 +24253,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_CPUMASK_T 1
-@@ -5452,25 +6126,25 @@
+@@ -5452,25 +6226,25 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24289,7 +24289,7 @@
else
cat >conftest.c <<_ACEOF
/* confdefs.h. */
-@@ -5516,33 +6190,33 @@
+@@ -5516,33 +6290,33 @@
#define CPU_AFFINITY 1
_ACEOF
@@ -24335,7 +24335,7 @@
else
BOCD="`grep -c TCP_BACKOFF $LINUX/include/linux/tcp.h`"
if test "$BOCD" != 0 ; then
-@@ -5551,72 +6225,72 @@
+@@ -5551,72 +6325,72 @@
#define SOCKNAL_BACKOFF 1
_ACEOF
@@ -24442,7 +24442,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -5654,8 +6328,8 @@
+@@ -5654,8 +6428,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -24453,7 +24453,7 @@
else
-@@ -5663,11 +6337,11 @@
+@@ -5663,11 +6437,11 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24469,7 +24469,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -5705,8 +6379,8 @@
+@@ -5705,8 +6479,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -24480,7 +24480,7 @@
else
-@@ -5714,8 +6388,8 @@
+@@ -5714,8 +6488,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24491,7 +24491,7 @@
{ echo "$as_me:$LINENO: WARNING: QSNET is not enabled in this kernel; not building qswlnd." >&5
echo "$as_me: WARNING: QSNET is not enabled in this kernel; not building qswlnd." >&2;}
-@@ -5733,8 +6407,8 @@
+@@ -5733,8 +6507,8 @@
fi
else
@@ -24502,7 +24502,7 @@
QSWLND=""
QSWCPPFLAGS=""
fi
-@@ -5742,13 +6416,12 @@
+@@ -5742,13 +6516,12 @@
@@ -24520,7 +24520,7 @@
case $with_gm in
no) ENABLE_GM=0
;;
-@@ -5761,25 +6434,26 @@
+@@ -5761,25 +6534,26 @@
ENABLE_GM=0
@@ -24556,7 +24556,7 @@
GMLND="gmlnd"
GMCPPFLAGS="-I$GM_SRC/include -I$GM_SRC/drivers -I$GM_SRC/drivers/linux/gm"
-@@ -5796,8 +6470,8 @@
+@@ -5796,8 +6570,8 @@
EXTRA_KCFLAGS_save="$EXTRA_KCFLAGS"
EXTRA_KCFLAGS="$GMCPPFLAGS -DGM_KERNEL $EXTRA_KCFLAGS"
@@ -24567,7 +24567,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -5838,16 +6512,16 @@
+@@ -5838,16 +6612,16 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -24588,7 +24588,7 @@
{ { echo "$as_me:$LINENO: error: Bad --with-gm path" >&5
echo "$as_me: error: Bad --with-gm path" >&2;}
{ (exit 1); exit 1; }; }
-@@ -5855,8 +6529,8 @@
+@@ -5855,8 +6629,8 @@
fi
rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
@@ -24599,7 +24599,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -5901,15 +6575,15 @@
+@@ -5901,15 +6675,15 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -24618,7 +24618,7 @@
Please patch the GM sources as follows...
cd $GM_SRC
patch -p0 < $PWD/lnet/klnds/gmlnd/gm-reg-phys.patch
-@@ -5918,7 +6592,7 @@
+@@ -5918,7 +6692,7 @@
Please patch the GM sources as follows...
cd $GM_SRC
patch -p0 < $PWD/lnet/klnds/gmlnd/gm-reg-phys.patch
@@ -24627,7 +24627,7 @@
{ { echo "$as_me:$LINENO: error: Can't build GM without gm_register_memory_ex_phys()" >&5
echo "$as_me: error: Can't build GM without gm_register_memory_ex_phys()" >&2;}
{ (exit 1); exit 1; }; }
-@@ -5933,15 +6607,14 @@
+@@ -5933,15 +6707,14 @@
@@ -24647,7 +24647,7 @@
case $with_openib in
yes) ENABLEOPENIB=2
;;
-@@ -5956,15 +6629,16 @@
+@@ -5956,15 +6729,16 @@
ENABLEOPENIB=1
@@ -24669,7 +24669,7 @@
case $ENABLEOPENIB in
1) ;;
2) { { echo "$as_me:$LINENO: error: kernel OpenIB headers not present" >&5
-@@ -5981,8 +6655,8 @@
+@@ -5981,8 +6755,8 @@
case $ENABLEOPENIB in
1|2) OPENIBCPPFLAGS="-I$OPENIBPATH/include -DIN_TREE_BUILD";;
3) OPENIBCPPFLAGS="-I$OPENIBPATH/include";;
@@ -24680,7 +24680,7 @@
{ { echo "$as_me:$LINENO: error: internal error" >&5
echo "$as_me: error: internal error" >&2;}
{ (exit 1); exit 1; }; };;
-@@ -6032,8 +6706,8 @@
+@@ -6032,8 +6806,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -24691,7 +24691,7 @@
OPENIBLND="openiblnd"
else
-@@ -6041,8 +6715,8 @@
+@@ -6041,8 +6815,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24702,7 +24702,7 @@
case $ENABLEOPENIB in
1) ;;
2) { { echo "$as_me:$LINENO: error: can't compile with kernel OpenIB headers" >&5
-@@ -6066,26 +6740,25 @@
+@@ -6066,26 +6840,25 @@
@@ -24739,7 +24739,7 @@
{ { echo "$as_me:$LINENO: error: No directory $CIBPATH" >&5
echo "$as_me: error: No directory $CIBPATH" >&2;}
{ (exit 1); exit 1; }; }
-@@ -6094,10 +6767,11 @@
+@@ -6094,10 +6867,11 @@
else
@@ -24754,7 +24754,7 @@
if test -n "$CIBPATH"; then
CIBCPPFLAGS="-I${CIBPATH}/ib/ts_api_ng/include -I${CIBPATH}/all/kernel_services/include -DUSING_TSAPI"
CIBCPPFLAGS="$CIBCPPFLAGS -DIB_NTXRXPARAMS=3"
-@@ -6164,24 +6838,23 @@
+@@ -6164,24 +6938,23 @@
@@ -24789,7 +24789,7 @@
{ { echo "$as_me:$LINENO: error: No directory $VIBPATH" >&5
echo "$as_me: error: No directory $VIBPATH" >&2;}
{ (exit 1); exit 1; }; }
-@@ -6190,10 +6863,11 @@
+@@ -6190,10 +6963,11 @@
else
@@ -24804,7 +24804,7 @@
if test -z "$VIBPATH"; then
VIBLND=""
else
-@@ -6275,8 +6949,8 @@
+@@ -6275,8 +7049,8 @@
if test -n "$VIBLND"; then
EXTRA_KCFLAGS_save="$EXTRA_KCFLAGS"
EXTRA_KCFLAGS="$EXTRA_KCFLAGS $VIBCPPFLAGS"
@@ -24815,7 +24815,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -6324,8 +6998,8 @@
+@@ -6324,8 +7098,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -24826,7 +24826,7 @@
VIBCPPFLAGS="$VIBCPPFLAGS -DIBNAL_VOIDSTAR_SGADDR=1"
else
-@@ -6333,8 +7007,8 @@
+@@ -6333,8 +7107,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24837,7 +24837,7 @@
fi
rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
-@@ -6344,15 +7018,14 @@
+@@ -6344,15 +7118,14 @@
@@ -24857,7 +24857,7 @@
case $with_iib in
yes) ENABLEIIB=2
;;
-@@ -6367,13 +7040,14 @@
+@@ -6367,13 +7140,14 @@
ENABLEIIB=1
@@ -24877,7 +24877,7 @@
case $ENABLEIIB in
1) ;;
2) { { echo "$as_me:$LINENO: error: default Infinicon headers not present" >&5
-@@ -6433,8 +7107,8 @@
+@@ -6433,8 +7207,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -24888,7 +24888,7 @@
IIBLND="iiblnd"
else
-@@ -6442,8 +7116,8 @@
+@@ -6442,8 +7216,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24899,7 +24899,7 @@
case $ENABLEIIB in
1) ;;
2) { { echo "$as_me:$LINENO: error: can't compile with default Infinicon headers" >&5
-@@ -6467,15 +7141,14 @@
+@@ -6467,15 +7241,14 @@
@@ -24919,7 +24919,7 @@
case $with_o2ib in
yes) ENABLEO2IB=2
;;
-@@ -6490,16 +7163,17 @@
+@@ -6490,16 +7263,17 @@
ENABLEO2IB=1
@@ -24942,7 +24942,7 @@
case $ENABLEO2IB in
1) ;;
2) { { echo "$as_me:$LINENO: error: kernel OpenIB gen2 headers not present" >&5
-@@ -6565,8 +7239,8 @@
+@@ -6565,8 +7339,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -24953,7 +24953,7 @@
O2IBLND="o2iblnd"
else
-@@ -6574,8 +7248,8 @@
+@@ -6574,8 +7348,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24964,7 +24964,7 @@
case $ENABLEO2IB in
1) ;;
2) { { echo "$as_me:$LINENO: error: can't compile with kernel OpenIB gen2 headers" >&5
-@@ -6615,8 +7289,8 @@
+@@ -6615,8 +7389,8 @@
#### Rapid Array
@@ -24975,7 +24975,7 @@
# placeholder
RACPPFLAGS="-I${LINUX}/drivers/xd1/include"
EXTRA_KCFLAGS_save="$EXTRA_KCFLAGS"
-@@ -6660,8 +7334,8 @@
+@@ -6660,8 +7434,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -24986,7 +24986,7 @@
RALND="ralnd"
else
-@@ -6669,8 +7343,8 @@
+@@ -6669,8 +7443,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24997,7 +24997,7 @@
RALND=""
RACPPFLAGS=""
-@@ -6682,13 +7356,12 @@
+@@ -6682,13 +7456,12 @@
if test -z "$ENABLEPORTALS"; then
@@ -25015,7 +25015,7 @@
case $with_portals in
no) ENABLEPORTALS=0
;;
-@@ -6702,49 +7375,49 @@
+@@ -6702,49 +7475,49 @@
ENABLEPORTALS=0
@@ -25083,7 +25083,7 @@
case $with_mx in
yes) ENABLEMX=2
;;
-@@ -6759,15 +7432,16 @@
+@@ -6759,15 +7532,16 @@
ENABLEMX=1
@@ -25105,7 +25105,7 @@
case $ENABLEMX in
1) ;;
2) { { echo "$as_me:$LINENO: error: Myrinet MX kernel headers not present" >&5
-@@ -6830,8 +7504,8 @@
+@@ -6830,8 +7604,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -25116,7 +25116,7 @@
MXLND="mxlnd"
else
-@@ -6839,8 +7513,8 @@
+@@ -6839,8 +7613,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25127,7 +25127,7 @@
case $ENABLEMX in
1) ;;
2) { { echo "$as_me:$LINENO: error: can't compile with Myrinet MX kernel headers" >&5
-@@ -6865,8 +7539,8 @@
+@@ -6865,8 +7639,8 @@
@@ -25138,7 +25138,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -6901,8 +7575,8 @@
+@@ -6901,8 +7675,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -25149,7 +25149,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_PAGE_LIST 1
-@@ -6914,14 +7588,14 @@
+@@ -6914,14 +7688,14 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25168,7 +25168,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -6961,22 +7635,22 @@
+@@ -6961,22 +7735,22 @@
#define CONFIG_RH_2_4_20 1
_ACEOF
@@ -25197,7 +25197,7 @@
grep -q -E '[[:space:]]show_task[[:space:]]' $LINUX/Module.symvers 2>/dev/null
rc=$?
if test $rc -ne 0; then
-@@ -6990,13 +7664,13 @@
+@@ -6990,13 +7764,13 @@
fi
done
if test $export -eq 0; then
@@ -25215,7 +25215,7 @@
cat >>confdefs.h <<\_ACEOF
-@@ -7006,8 +7680,8 @@
+@@ -7006,8 +7780,8 @@
fi
else
@@ -25226,7 +25226,7 @@
cat >>confdefs.h <<\_ACEOF
-@@ -7019,8 +7693,8 @@
+@@ -7019,8 +7793,8 @@
# 2.6.18
@@ -25237,7 +25237,7 @@
grep -q -E '[[:space:]]tasklist_lock[[:space:]]' $LINUX/Module.symvers 2>/dev/null
rc=$?
if test $rc -ne 0; then
-@@ -7034,13 +7708,13 @@
+@@ -7034,13 +7808,13 @@
fi
done
if test $export -eq 0; then
@@ -25255,7 +25255,7 @@
cat >>confdefs.h <<\_ACEOF
-@@ -7050,8 +7724,8 @@
+@@ -7050,8 +7824,8 @@
fi
else
@@ -25266,7 +25266,7 @@
cat >>confdefs.h <<\_ACEOF
-@@ -7063,8 +7737,8 @@
+@@ -7063,8 +7837,8 @@
# 2.6.19
@@ -25277,7 +25277,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -7098,8 +7772,8 @@
+@@ -7098,8 +7872,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -25288,7 +25288,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_KMEM_CACHE_DESTROY_INT 1
-@@ -7111,14 +7785,14 @@
+@@ -7111,14 +7885,14 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25307,7 +25307,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -7153,8 +7827,8 @@
+@@ -7153,8 +7927,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -25318,7 +25318,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_ATOMIC_PANIC_NOTIFIER 1
-@@ -7166,15 +7840,15 @@
+@@ -7166,15 +7940,15 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25338,7 +25338,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -7210,8 +7884,8 @@
+@@ -7210,8 +7984,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -25349,7 +25349,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_3ARGS_INIT_WORK 1
-@@ -7223,15 +7897,15 @@
+@@ -7223,15 +7997,15 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25369,7 +25369,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -7265,8 +7939,8 @@
+@@ -7265,8 +8039,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -25380,7 +25380,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_2ARGS_REGISTER_SYSCTL 1
-@@ -7278,14 +7952,14 @@
+@@ -7278,14 +8052,14 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25399,7 +25399,7 @@
tmp_flags="$EXTRA_KCFLAGS"
EXTRA_KCFLAGS="-Werror"
cat >conftest.c <<_ACEOF
-@@ -7324,8 +7998,8 @@
+@@ -7324,8 +8098,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -25410,7 +25410,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_KMEM_CACHE_S 1
-@@ -7337,8 +8011,8 @@
+@@ -7337,8 +8111,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25421,7 +25421,7 @@
fi
rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
-@@ -7346,9 +8020,9 @@
+@@ -7346,9 +8120,9 @@
as_lb_File=`echo "lb_cv_file_$LINUX/include/linux/lustre_version.h" | $as_tr_sh`
@@ -25434,7 +25434,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -r "$LINUX/include/linux/lustre_version.h"; then
-@@ -7357,8 +8031,9 @@
+@@ -7357,8 +8131,9 @@
eval "$as_lb_File=no"
fi
fi
@@ -25446,7 +25446,7 @@
if test `eval echo '${'$as_lb_File'}'` = yes; then
rm -f "$LUSTRE/include/linux/lustre_version.h"
-@@ -7393,8 +8068,8 @@
+@@ -7393,8 +8168,8 @@
fi
# --- Check that ext3 and ext3 xattr are enabled in the kernel
@@ -25457,7 +25457,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -7432,8 +8107,8 @@
+@@ -7432,8 +8207,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -25468,7 +25468,7 @@
else
-@@ -7441,11 +8116,11 @@
+@@ -7441,11 +8216,11 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25484,7 +25484,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -7483,8 +8158,8 @@
+@@ -7483,8 +8258,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -25495,7 +25495,7 @@
else
-@@ -7492,8 +8167,8 @@
+@@ -7492,8 +8267,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25506,7 +25506,7 @@
{ { echo "$as_me:$LINENO: error: Lustre requires that ext3 is enabled in the kernel" >&5
echo "$as_me: error: Lustre requires that ext3 is enabled in the kernel" >&2;}
-@@ -7508,8 +8183,8 @@
+@@ -7508,8 +8283,8 @@
fi
rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
@@ -25517,7 +25517,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -7547,8 +8222,8 @@
+@@ -7547,8 +8322,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -25528,7 +25528,7 @@
else
-@@ -7556,8 +8231,8 @@
+@@ -7556,8 +8331,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25539,7 +25539,7 @@
{ echo "$as_me:$LINENO: WARNING: Lustre requires that extended attributes for ext3 are enabled in the kernel" >&5
echo "$as_me: WARNING: Lustre requires that extended attributes for ext3 are enabled in the kernel" >&2;}
-@@ -7595,24 +8270,24 @@
+@@ -7595,24 +8370,24 @@
fi #ldiskfs
@@ -25576,7 +25576,7 @@
if test x$enable_pinger != xno ; then
cat >>confdefs.h <<\_ACEOF
-@@ -7621,17 +8296,17 @@
+@@ -7621,17 +8396,17 @@
fi
@@ -25602,7 +25602,7 @@
if test x$enable_liblustre_recovery != xno ; then
cat >>confdefs.h <<\_ACEOF
-@@ -7640,17 +8315,17 @@
+@@ -7640,17 +8415,17 @@
fi
@@ -25628,7 +25628,7 @@
if test x$linux25 != xyes; then
enable_quota='no'
fi
-@@ -7662,17 +8337,17 @@
+@@ -7662,17 +8437,17 @@
fi
@@ -25654,7 +25654,7 @@
if test x$enable_health_write == xyes ; then
cat >>confdefs.h <<\_ACEOF
-@@ -7682,8 +8357,8 @@
+@@ -7682,8 +8457,8 @@
fi
@@ -25665,7 +25665,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -7719,8 +8394,8 @@
+@@ -7719,8 +8494,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -25676,7 +25676,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_TASK_PPTR 1
-@@ -7732,15 +8407,15 @@
+@@ -7732,15 +8507,15 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25696,7 +25696,7 @@
grep -q -E '[[:space:]]truncate_complete_page[[:space:]]' $LINUX/Module.symvers 2>/dev/null
rc=$?
if test $rc -ne 0; then
-@@ -7754,13 +8429,13 @@
+@@ -7754,13 +8529,13 @@
fi
done
if test $export -eq 0; then
@@ -25714,7 +25714,7 @@
cat >>confdefs.h <<\_ACEOF
-@@ -7770,8 +8445,8 @@
+@@ -7770,8 +8545,8 @@
fi
else
@@ -25725,7 +25725,7 @@
cat >>confdefs.h <<\_ACEOF
-@@ -7782,8 +8457,8 @@
+@@ -7782,8 +8557,8 @@
fi
@@ -25736,7 +25736,7 @@
grep -q -E '[[:space:]]d_rehash_cond[[:space:]]' $LINUX/Module.symvers 2>/dev/null
rc=$?
if test $rc -ne 0; then
-@@ -7797,13 +8472,13 @@
+@@ -7797,13 +8572,13 @@
fi
done
if test $export -eq 0; then
@@ -25754,7 +25754,7 @@
cat >>confdefs.h <<\_ACEOF
-@@ -7813,8 +8488,8 @@
+@@ -7813,8 +8588,8 @@
fi
else
@@ -25765,7 +25765,7 @@
cat >>confdefs.h <<\_ACEOF
-@@ -7825,8 +8500,8 @@
+@@ -7825,8 +8600,8 @@
fi
@@ -25776,7 +25776,7 @@
grep -q -E '[[:space:]]__d_rehash[[:space:]]' $LINUX/Module.symvers 2>/dev/null
rc=$?
if test $rc -ne 0; then
-@@ -7840,13 +8515,13 @@
+@@ -7840,13 +8615,13 @@
fi
done
if test $export -eq 0; then
@@ -25794,7 +25794,7 @@
cat >>confdefs.h <<\_ACEOF
-@@ -7856,8 +8531,8 @@
+@@ -7856,8 +8631,8 @@
fi
else
@@ -25805,7 +25805,7 @@
cat >>confdefs.h <<\_ACEOF
-@@ -7869,8 +8544,8 @@
+@@ -7869,8 +8644,8 @@
@@ -25816,7 +25816,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -7905,8 +8580,8 @@
+@@ -7905,8 +8680,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -25827,7 +25827,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_KIOBUF_DOVARY 1
-@@ -7918,14 +8593,14 @@
+@@ -7918,14 +8693,14 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25846,7 +25846,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -7959,8 +8634,8 @@
+@@ -7959,8 +8734,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -25857,7 +25857,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_COND_RESCHED 1
-@@ -7972,14 +8647,14 @@
+@@ -7972,14 +8747,14 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25876,7 +25876,7 @@
ZAP_PAGE_RANGE_VMA="`grep -c 'zap_page_range.*struct vm_area_struct' $LINUX/include/linux/mm.h`"
if test "$ZAP_PAGE_RANGE_VMA" != 0 ; then
-@@ -7987,15 +8662,15 @@
+@@ -7987,15 +8762,15 @@
#define ZAP_PAGE_RANGE_VMA 1
_ACEOF
@@ -25898,7 +25898,7 @@
HAVE_PDE="`grep -c 'proc_dir_entry..PDE' $LINUX/include/linux/proc_fs.h`"
if test "$HAVE_PDE" != 0 ; then
-@@ -8003,15 +8678,15 @@
+@@ -8003,15 +8778,15 @@
#define HAVE_PDE 1
_ACEOF
@@ -25920,7 +25920,7 @@
HAVE_DIO_FILE="`grep -c 'direct_IO.*struct file' $LINUX/include/linux/fs.h`"
if test "$HAVE_DIO_FILE" != 0 ; then
-@@ -8019,15 +8694,15 @@
+@@ -8019,15 +8794,15 @@
#define HAVE_DIO_FILE 1
_ACEOF
@@ -25942,7 +25942,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8063,8 +8738,8 @@
+@@ -8063,8 +8838,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -25953,7 +25953,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_MM_INLINE 1
-@@ -8076,14 +8751,14 @@
+@@ -8076,14 +8851,14 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25972,7 +25972,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8122,8 +8797,8 @@
+@@ -8122,8 +8897,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -25983,7 +25983,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_I_ALLOC_SEM 1
-@@ -8135,14 +8810,14 @@
+@@ -8135,14 +8910,14 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26002,7 +26002,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8177,15 +8852,15 @@
+@@ -8177,15 +8952,15 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -26022,7 +26022,7 @@
HAVE_CACHE_RETURN_INT="`grep -c 'int.*shrink' $LINUX/include/linux/cache_def.h`"
if test "$HAVE_CACHE_RETURN_INT" != 0 ; then
-@@ -8193,11 +8868,11 @@
+@@ -8193,11 +8968,11 @@
#define HAVE_CACHE_RETURN_INT 1
_ACEOF
@@ -26038,7 +26038,7 @@
fi
else
-@@ -8205,14 +8880,14 @@
+@@ -8205,14 +8980,14 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26057,7 +26057,7 @@
HAVE_GCPN_GFP="`grep -c 'grab_cache_page_nowait_gfp' $LINUX/include/linux/pagemap.h`"
if test "$HAVE_GCPN_GFP" != 0 ; then
-@@ -8220,15 +8895,15 @@
+@@ -8220,15 +8995,15 @@
#define HAVE_GRAB_CACHE_PAGE_NOWAIT_GFP 1
_ACEOF
@@ -26079,7 +26079,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8264,8 +8939,8 @@
+@@ -8264,8 +9039,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -26090,7 +26090,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_DEV_SET_RDONLY 1
-@@ -8277,16 +8952,16 @@
+@@ -8277,16 +9052,16 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26111,7 +26111,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8320,8 +8995,8 @@
+@@ -8320,8 +9095,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -26122,7 +26122,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_FILEMAP_FDATAWRITE 1
-@@ -8333,14 +9008,14 @@
+@@ -8333,14 +9108,14 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26141,7 +26141,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8375,8 +9050,8 @@
+@@ -8375,8 +9150,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -26152,7 +26152,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_STATFS_NAMELEN 1
-@@ -8388,14 +9063,14 @@
+@@ -8388,14 +9163,14 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26171,7 +26171,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8429,8 +9104,8 @@
+@@ -8429,8 +9204,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -26182,7 +26182,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_PAGE_MAPPED 1
-@@ -8442,14 +9117,14 @@
+@@ -8442,14 +9217,14 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26201,7 +26201,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8484,8 +9159,8 @@
+@@ -8484,8 +9259,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -26212,7 +26212,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_UNLOCKED_IOCTL 1
-@@ -8497,14 +9172,14 @@
+@@ -8497,14 +9272,14 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26231,7 +26231,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8539,8 +9214,8 @@
+@@ -8539,8 +9314,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -26242,7 +26242,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_FILEMAP_POPULATE 1
-@@ -8552,14 +9227,14 @@
+@@ -8552,14 +9327,14 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26261,7 +26261,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8593,8 +9268,8 @@
+@@ -8593,8 +9368,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -26272,7 +26272,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_D_ADD_UNIQUE 1
-@@ -8606,16 +9281,16 @@
+@@ -8606,16 +9381,16 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26294,7 +26294,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -r "$LINUX/include/linux/bit_spinlock.h"; then
-@@ -8624,12 +9299,13 @@
+@@ -8624,12 +9399,13 @@
eval "$as_lb_File=no"
fi
fi
@@ -26312,7 +26312,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8663,8 +9339,8 @@
+@@ -8663,8 +9439,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -26323,7 +26323,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_BIT_SPINLOCK_H 1
-@@ -8676,8 +9352,8 @@
+@@ -8676,8 +9452,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26334,7 +26334,7 @@
fi
rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
-@@ -8686,9 +9362,9 @@
+@@ -8686,9 +9462,9 @@
as_lb_File=`echo "lb_cv_file_$LINUX/include/linux/xattr_acl.h" | $as_tr_sh`
@@ -26347,7 +26347,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -r "$LINUX/include/linux/xattr_acl.h"; then
-@@ -8697,12 +9373,13 @@
+@@ -8697,12 +9473,13 @@
eval "$as_lb_File=no"
fi
fi
@@ -26365,7 +26365,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8734,8 +9411,8 @@
+@@ -8734,8 +9511,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -26376,7 +26376,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_XATTR_ACL 1
-@@ -8747,8 +9424,8 @@
+@@ -8747,8 +9524,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26387,7 +26387,7 @@
fi
rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
-@@ -8756,8 +9433,8 @@
+@@ -8756,8 +9533,8 @@
fi
@@ -26398,7 +26398,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8793,8 +9470,8 @@
+@@ -8793,8 +9570,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -26409,7 +26409,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_FILE_IN_STRUCT_INTENT 1
-@@ -8806,16 +9483,16 @@
+@@ -8806,16 +9583,16 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26431,7 +26431,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -r "$LINUX/include/linux/posix_acl_xattr.h"; then
-@@ -8824,12 +9501,13 @@
+@@ -8824,12 +9601,13 @@
eval "$as_lb_File=no"
fi
fi
@@ -26449,7 +26449,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8861,8 +9539,8 @@
+@@ -8861,8 +9639,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -26460,7 +26460,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_LINUX_POSIX_ACL_XATTR_H 1
-@@ -8875,8 +9553,8 @@
+@@ -8875,8 +9653,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26471,7 +26471,7 @@
fi
rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
-@@ -8884,14 +9562,14 @@
+@@ -8884,14 +9662,14 @@
else
@@ -26490,7 +26490,7 @@
grep -q -E '[[:space:]]__iget[[:space:]]' $LINUX/Module.symvers 2>/dev/null
rc=$?
if test $rc -ne 0; then
-@@ -8905,13 +9583,13 @@
+@@ -8905,13 +9683,13 @@
fi
done
if test $export -eq 0; then
@@ -26508,7 +26508,7 @@
cat >>confdefs.h <<\_ACEOF
-@@ -8921,8 +9599,8 @@
+@@ -8921,8 +9699,8 @@
fi
else
@@ -26519,7 +26519,7 @@
cat >>confdefs.h <<\_ACEOF
-@@ -8933,8 +9611,8 @@
+@@ -8933,8 +9711,8 @@
fi
@@ -26530,7 +26530,7 @@
grep -q -E '[[:space:]]set_fs_pwd[[:space:]]' $LINUX/Module.symvers 2>/dev/null
rc=$?
if test $rc -ne 0; then
-@@ -8948,13 +9626,13 @@
+@@ -8948,13 +9726,13 @@
fi
done
if test $export -eq 0; then
@@ -26548,7 +26548,7 @@
cat >>confdefs.h <<\_ACEOF
-@@ -8964,8 +9642,8 @@
+@@ -8964,8 +9742,8 @@
fi
else
@@ -26559,7 +26559,7 @@
cat >>confdefs.h <<\_ACEOF
-@@ -8976,8 +9654,8 @@
+@@ -8976,8 +9754,8 @@
fi
@@ -26570,7 +26570,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -9016,22 +9694,22 @@
+@@ -9016,22 +9794,22 @@
#define HAVE_MS_FLOCK_LOCK 1
_ACEOF
@@ -26599,7 +26599,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -9073,22 +9751,22 @@
+@@ -9073,22 +9851,22 @@
#define HAVE_CAN_SLEEP_ARG 1
_ACEOF
@@ -26628,7 +26628,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -9128,22 +9806,22 @@
+@@ -9128,22 +9906,22 @@
#define HAVE_F_OP_FLOCK 1
_ACEOF
@@ -26657,7 +26657,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -9178,8 +9856,8 @@
+@@ -9178,8 +9956,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -26668,7 +26668,7 @@
cat >>confdefs.h <<\_ACEOF
#define KERNEL_SUPPORTS_QUOTA_READ 1
-@@ -9191,14 +9869,14 @@
+@@ -9191,14 +9969,14 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26687,7 +26687,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -9241,22 +9919,22 @@
+@@ -9241,22 +10019,22 @@
#define HAVE_COOKIE_FOLLOW_LINK 1
_ACEOF
@@ -26716,7 +26716,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -9293,11 +9971,11 @@
+@@ -9293,11 +10071,11 @@
#define HAVE_RCU 1
_ACEOF
@@ -26732,7 +26732,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -9337,16 +10015,16 @@
+@@ -9337,16 +10115,16 @@
#define HAVE_CALL_RCU_PARAM 1
_ACEOF
@@ -26753,7 +26753,7 @@
fi
rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
-@@ -9356,16 +10034,16 @@
+@@ -9356,16 +10134,16 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26774,7 +26774,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -9406,8 +10084,8 @@
+@@ -9406,8 +10184,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -26785,7 +26785,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_VFS_INTENT_PATCHES 1
-@@ -9419,16 +10097,16 @@
+@@ -9419,16 +10197,16 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26806,7 +26806,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -9465,8 +10143,8 @@
+@@ -9465,8 +10243,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -26817,7 +26817,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_INODE_I_MUTEX 1
-@@ -9478,16 +10156,16 @@
+@@ -9478,16 +10256,16 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26838,7 +26838,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -9525,8 +10203,8 @@
+@@ -9525,8 +10303,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -26849,7 +26849,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_DQUOTOFF_MUTEX 1
-@@ -9538,16 +10216,16 @@
+@@ -9538,16 +10316,16 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26870,7 +26870,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -9581,8 +10259,8 @@
+@@ -9581,8 +10359,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -26881,7 +26881,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_NR_PAGECACHE 1
-@@ -9594,14 +10272,14 @@
+@@ -9594,14 +10372,14 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26900,7 +26900,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -9640,22 +10318,22 @@
+@@ -9640,22 +10418,22 @@
#define HAVE_STATFS_DENTRY_PARAM 1
_ACEOF
@@ -26929,7 +26929,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -9694,22 +10372,22 @@
+@@ -9694,22 +10472,22 @@
#define HAVE_VFS_KERN_MOUNT 1
_ACEOF
@@ -26958,7 +26958,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -9743,8 +10421,8 @@
+@@ -9743,8 +10521,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -26969,7 +26969,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_INVALIDATEPAGE_RETURN_INT 1
-@@ -9756,14 +10434,14 @@
+@@ -9756,14 +10534,14 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26988,7 +26988,7 @@
tmp_flags="$EXTRA_KCFLAGS"
EXTRA_KCFLAGS="-Werror"
cat >conftest.c <<_ACEOF
-@@ -9809,8 +10487,8 @@
+@@ -9809,8 +10587,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -26999,7 +26999,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_UMOUNTBEGIN_VFSMOUNT 1
-@@ -9822,8 +10500,8 @@
+@@ -9822,8 +10600,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27010,7 +27010,7 @@
fi
rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
-@@ -9831,8 +10509,8 @@
+@@ -9831,8 +10609,8 @@
#2.6.18 + RHEL5 (fc6)
@@ -27021,7 +27021,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -9868,8 +10546,8 @@
+@@ -9868,8 +10646,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -27032,7 +27032,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_PG_FS_MISC 1
-@@ -9881,16 +10559,16 @@
+@@ -9881,16 +10659,16 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27053,7 +27053,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -9925,8 +10603,8 @@
+@@ -9925,8 +10703,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -27064,7 +27064,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_INODE_BLKSIZE 1
-@@ -9938,14 +10616,14 @@
+@@ -9938,14 +10716,14 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27083,7 +27083,7 @@
tmp_flags="$EXTRA_KCFLAGS"
EXTRA_KCFLAGS="-Werror"
cat >conftest.c <<_ACEOF
-@@ -9989,8 +10667,8 @@
+@@ -9989,8 +10767,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -27094,7 +27094,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_VFS_READDIR_U64_INO 1
-@@ -10002,15 +10680,15 @@
+@@ -10002,15 +10780,15 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27114,7 +27114,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -10044,8 +10722,8 @@
+@@ -10044,8 +10822,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -27125,7 +27125,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_GENERIC_FILE_READ 1
-@@ -10057,14 +10735,14 @@
+@@ -10057,14 +10835,14 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27144,7 +27144,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -10098,8 +10776,8 @@
+@@ -10098,8 +10876,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -27155,7 +27155,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_GENERIC_FILE_WRITE 1
-@@ -10111,16 +10789,16 @@
+@@ -10111,16 +10889,16 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27176,7 +27176,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -10154,8 +10832,8 @@
+@@ -10154,8 +10932,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -27187,7 +27187,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_CANCEL_DIRTY_PAGE 1
-@@ -10167,16 +10845,16 @@
+@@ -10167,16 +10945,16 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27208,7 +27208,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -10212,8 +10890,8 @@
+@@ -10212,8 +10990,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -27219,7 +27219,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_PAGE_CONSTANT 1
-@@ -10225,8 +10903,8 @@
+@@ -10225,8 +11003,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27230,7 +27230,7 @@
fi
rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
-@@ -10234,102 +10912,7 @@
+@@ -10234,102 +11012,7 @@
;;
darwin*)
@@ -27334,7 +27334,7 @@
;;
*)
# This is strange - Lustre supports a target we don't
-@@ -10342,10 +10925,9 @@
+@@ -10342,10 +11025,9 @@
@@ -27347,7 +27347,7 @@
else
case $lb_target_os in
-@@ -10357,18 +10939,19 @@
+@@ -10357,18 +11039,19 @@
;;
esac
@@ -27375,7 +27375,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -r "$srcdir/libsysio/src/rmdir.c"; then
-@@ -10377,8 +10960,9 @@
+@@ -10377,8 +11060,9 @@
eval "$as_lb_File=no"
fi
fi
@@ -27387,7 +27387,7 @@
if test `eval echo '${'$as_lb_File'}'` = yes; then
:
else
-@@ -10393,16 +10977,16 @@
+@@ -10393,16 +11077,16 @@
SYSIO="$PWD/libsysio"
;;
xno)
@@ -27411,7 +27411,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -r "$with_sysio/lib/libsysio.a"; then
-@@ -10411,8 +10995,9 @@
+@@ -10411,8 +11095,9 @@
eval "$as_lb_File=no"
fi
fi
@@ -27423,7 +27423,7 @@
if test `eval echo '${'$as_lb_File'}'` = yes; then
:
else
-@@ -10429,15 +11014,13 @@
+@@ -10429,15 +11114,13 @@
esac
# We have to configure even if we don't build here for make dist to work
@@ -27442,7 +27442,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -r "$srcdir/snmp/lustre-snmp.c"; then
-@@ -10446,8 +11029,9 @@
+@@ -10446,8 +11129,9 @@
eval "$as_lb_File=no"
fi
fi
@@ -27454,7 +27454,7 @@
if test `eval echo '${'$as_lb_File'}'` = yes; then
SNMP_DIST_SUBDIR="snmp"
fi
-@@ -10456,10 +11040,9 @@
+@@ -10456,10 +11140,9 @@
@@ -27467,7 +27467,7 @@
else
if test x$linux25$enable_server = xyesyes ; then
-@@ -10468,17 +11051,18 @@
+@@ -10468,17 +11151,18 @@
with_ldiskfs=no
fi
@@ -27494,7 +27494,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -r "$srcdir/ldiskfs/lustre-ldiskfs.spec.in"; then
-@@ -10487,8 +11071,9 @@
+@@ -10487,8 +11171,9 @@
eval "$as_lb_File=no"
fi
fi
@@ -27506,7 +27506,7 @@
if test `eval echo '${'$as_lb_File'}'` = yes; then
:
else
-@@ -10503,16 +11088,16 @@
+@@ -10503,16 +11188,16 @@
LDISKFS_DIR="$PWD/ldiskfs"
;;
xno)
@@ -27530,7 +27530,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -r "$with_ldiskfs/ldiskfs/linux/ldiskfs_fs.h"; then
-@@ -10521,8 +11106,9 @@
+@@ -10521,8 +11206,9 @@
eval "$as_lb_File=no"
fi
fi
@@ -27542,7 +27542,7 @@
if test `eval echo '${'$as_lb_File'}'` = yes; then
:
else
-@@ -10540,68 +11126,66 @@
+@@ -10540,68 +11226,66 @@
# We have to configure even if we don't build here for make dist to work
@@ -27643,7 +27643,7 @@
if test x$enable_pinger != xno ; then
cat >>confdefs.h <<\_ACEOF
-@@ -10610,17 +11194,17 @@
+@@ -10610,17 +11294,17 @@
fi
@@ -27669,7 +27669,7 @@
if test x$enable_liblustre_recovery != xno ; then
cat >>confdefs.h <<\_ACEOF
-@@ -10639,18 +11223,19 @@
+@@ -10639,18 +11323,19 @@
for ac_header in netdb.h netinet/tcp.h asm/types.h endian.h sys/ioctl.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -27697,7 +27697,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -10661,41 +11246,37 @@
+@@ -10661,27 +11346,22 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -27736,10 +27736,9 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
+@@ -10689,13 +11369,14 @@
+
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
@@ -27757,7 +27756,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -10704,24 +11285,22 @@
+@@ -10704,24 +11385,22 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -27793,7 +27792,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10729,9 +11308,10 @@
+@@ -10729,9 +11408,10 @@
ac_header_preproc=no
fi
@@ -27806,7 +27805,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -10755,25 +11335,24 @@
+@@ -10755,25 +11435,24 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -27840,7 +27839,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -10791,9 +11370,9 @@
+@@ -10791,9 +11470,9 @@
for ac_func in gethostbyname socket connect
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -27853,7 +27852,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -10819,68 +11398,60 @@
+@@ -10819,56 +11498,46 @@
#undef $ac_func
@@ -27927,10 +27926,9 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_var=no"
-+ eval "$as_ac_var=no"
+@@ -10876,11 +11545,13 @@
+
+ eval "$as_ac_var=no"
fi
-rm -f conftest.err conftest.$ac_objext \
+
@@ -27945,7 +27943,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -10895,18 +11466,19 @@
+@@ -10895,18 +11566,19 @@
for ac_header in linux/version.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -27973,7 +27971,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -10917,41 +11489,37 @@
+@@ -10917,27 +11589,22 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -28012,10 +28010,9 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
+@@ -10945,13 +11612,14 @@
+
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
@@ -28033,7 +28030,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -10960,24 +11528,22 @@
+@@ -10960,24 +11628,22 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -28069,7 +28066,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10985,9 +11551,10 @@
+@@ -10985,9 +11651,10 @@
ac_header_preproc=no
fi
@@ -28082,7 +28079,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -11011,25 +11578,24 @@
+@@ -11011,25 +11678,24 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -28116,7 +28113,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -11042,8 +11608,8 @@
+@@ -11042,8 +11708,8 @@
done
@@ -28127,7 +28124,7 @@
if test "${ac_cv_type_spinlock_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11055,50 +11621,47 @@
+@@ -11055,39 +11721,35 @@
/* end confdefs.h. */
#include <linux/spinlock.h>
@@ -28181,10 +28178,9 @@
ac_cv_type_spinlock_t=yes
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_type_spinlock_t=no
-+ ac_cv_type_spinlock_t=no
+@@ -11095,10 +11757,11 @@
+
+ ac_cv_type_spinlock_t=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
@@ -28197,7 +28193,7 @@
if test $ac_cv_type_spinlock_t = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -11113,9 +11676,9 @@
+@@ -11113,9 +11776,9 @@
for ac_func in strnlen
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -28210,7 +28206,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -11141,68 +11704,60 @@
+@@ -11141,56 +11804,46 @@
#undef $ac_func
@@ -28284,10 +28280,9 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_var=no"
-+ eval "$as_ac_var=no"
+@@ -11198,11 +11851,13 @@
+
+ eval "$as_ac_var=no"
fi
-rm -f conftest.err conftest.$ac_objext \
+
@@ -28302,7 +28297,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -11219,24 +11774,24 @@
+@@ -11219,24 +11874,24 @@
#
# Build with readline
#
@@ -28337,7 +28332,7 @@
if test "${ac_cv_lib_readline_readline+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11249,56 +11804,53 @@
+@@ -11249,43 +11904,39 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28397,10 +28392,9 @@
ac_cv_lib_readline_readline=yes
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_readline_readline=no
-+ ac_cv_lib_readline_readline=no
+@@ -11293,12 +11944,13 @@
+
+ ac_cv_lib_readline_readline=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
@@ -28415,7 +28409,7 @@
if test $ac_cv_lib_readline_readline = yes; then
LIBREADLINE="-lreadline -lncurses"
-@@ -11320,17 +11872,17 @@
+@@ -11320,17 +11972,17 @@
fi
@@ -28441,7 +28435,7 @@
if test "$enable_efence" = "yes" ; then
LIBEFENCE="-lefence"
-@@ -11344,12 +11896,11 @@
+@@ -11344,12 +11996,11 @@
# -------- enable acceptor libwrap (TCP wrappers) support? -------
@@ -28458,7 +28452,7 @@
yes) enable_libwrap=yes ;;
no) enable_libwrap=no ;;
*) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-libwrap" >&5
-@@ -11358,9 +11909,10 @@
+@@ -11358,9 +12009,10 @@
esac
else
enable_libwrap=no
@@ -28472,7 +28466,7 @@
if test x$enable_libwrap = xyes ; then
LIBWRAP="-lwrap"
-@@ -11374,18 +11926,18 @@
+@@ -11374,18 +12026,18 @@
# -------- check for -lpthread support ----
@@ -28499,7 +28493,7 @@
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11398,56 +11950,53 @@
+@@ -11398,43 +12050,39 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28559,10 +28553,9 @@
ac_cv_lib_pthread_pthread_create=yes
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_pthread_pthread_create=no
-+ ac_cv_lib_pthread_pthread_create=no
+@@ -11442,12 +12090,13 @@
+
+ ac_cv_lib_pthread_pthread_create=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
@@ -28577,7 +28570,7 @@
if test $ac_cv_lib_pthread_pthread_create = yes; then
ENABLE_LIBPTHREAD="yes"
else
-@@ -11455,8 +12004,8 @@
+@@ -11455,8 +12104,8 @@
fi
if test "$ENABLE_LIBPTHREAD" = "yes" ; then
@@ -28588,7 +28581,7 @@
PTHREAD_LIBS="-lpthread"
cat >>confdefs.h <<\_ACEOF
-@@ -11465,13 +12014,13 @@
+@@ -11465,13 +12114,13 @@
else
PTHREAD_LIBS=""
@@ -28606,7 +28599,7 @@
ENABLE_LIBPTHREAD="no"
fi
-@@ -11479,17 +12028,17 @@
+@@ -11479,17 +12128,17 @@
# ----------------------------------------
# some tests for catamount-like systems
# ----------------------------------------
@@ -28632,7 +28625,7 @@
if test x$enable_sysio_init != xno ; then
cat >>confdefs.h <<\_ACEOF
-@@ -11498,17 +12047,17 @@
+@@ -11498,17 +12147,17 @@
fi
@@ -28658,7 +28651,7 @@
if test x$enable_urandom != xno ; then
cat >>confdefs.h <<\_ACEOF
-@@ -11519,8 +12068,8 @@
+@@ -11519,8 +12168,8 @@
# -------- check for -lcap support ----
if test x$enable_liblustre = xyes ; then
@@ -28669,7 +28662,7 @@
if test "${ac_cv_lib_cap_cap_get_proc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11533,56 +12082,53 @@
+@@ -11533,43 +12182,39 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28729,10 +28722,9 @@
ac_cv_lib_cap_cap_get_proc=yes
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_cap_cap_get_proc=no
-+ ac_cv_lib_cap_cap_get_proc=no
+@@ -11577,12 +12222,13 @@
+
+ ac_cv_lib_cap_cap_get_proc=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
@@ -28747,7 +28739,7 @@
if test $ac_cv_lib_cap_cap_get_proc = yes; then
CAP_LIBS="-lcap"
-@@ -11602,25 +12148,25 @@
+@@ -11602,25 +12248,25 @@
fi
@@ -28783,7 +28775,7 @@
cat >>confdefs.h <<_ACEOF
#define LNET_MAX_PAYLOAD $LNET_MAX_PAYLOAD
-@@ -11629,13 +12175,12 @@
+@@ -11629,13 +12275,12 @@
if test -z "$ENABLEPORTALS"; then
@@ -28801,7 +28793,7 @@
case $with_portals in
no) ENABLEPORTALS=0
;;
-@@ -11649,85 +12194,86 @@
+@@ -11649,85 +12294,86 @@
ENABLEPORTALS=0
@@ -28921,7 +28913,7 @@
cat >>confdefs.h <<_ACEOF
#define OBD_MAX_IOCTL_BUFFER $OBD_BUFFER_SIZE
-@@ -11744,18 +12290,19 @@
+@@ -11744,18 +12390,19 @@
for ac_header in asm/page.h sys/user.h sys/vfs.h stdint.h blkid/blkid.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28949,7 +28941,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -11766,41 +12313,37 @@
+@@ -11766,27 +12413,22 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -28988,10 +28980,9 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
+@@ -11794,13 +12436,14 @@
+
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
@@ -29009,7 +29000,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -11809,24 +12352,22 @@
+@@ -11809,24 +12452,22 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -29045,7 +29036,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -11834,9 +12375,10 @@
+@@ -11834,9 +12475,10 @@
ac_header_preproc=no
fi
@@ -29058,7 +29049,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -11860,25 +12402,24 @@
+@@ -11860,25 +12502,24 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -29092,7 +29083,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -11897,18 +12438,19 @@
+@@ -11897,18 +12538,19 @@
for ac_header in linux/quota.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -29120,7 +29111,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -11919,41 +12461,37 @@
+@@ -11919,27 +12561,22 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -29159,10 +29150,9 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
+@@ -11947,13 +12584,14 @@
+
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
@@ -29180,7 +29170,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -11962,24 +12500,22 @@
+@@ -11962,24 +12600,22 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -29216,7 +29206,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -11987,9 +12523,10 @@
+@@ -11987,9 +12623,10 @@
ac_header_preproc=no
fi
@@ -29229,7 +29219,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -12013,25 +12550,24 @@
+@@ -12013,25 +12650,24 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -29263,7 +29253,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -12050,18 +12586,19 @@
+@@ -12050,18 +12686,19 @@
for ac_header in xtio.h file.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -29291,7 +29281,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -12072,41 +12609,37 @@
+@@ -12072,27 +12709,22 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -29330,10 +29320,9 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
+@@ -12100,13 +12732,14 @@
+
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
@@ -29351,7 +29340,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -12115,24 +12648,22 @@
+@@ -12115,24 +12748,22 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -29387,7 +29376,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -12140,9 +12671,10 @@
+@@ -12140,9 +12771,10 @@
ac_header_preproc=no
fi
@@ -29400,7 +29389,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -12166,25 +12698,24 @@
+@@ -12166,25 +12798,24 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -29434,7 +29423,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -12205,18 +12736,19 @@
+@@ -12205,18 +12836,19 @@
for ac_header in linux/types.h sys/types.h linux/unistd.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -29462,7 +29451,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -12227,41 +12759,37 @@
+@@ -12227,27 +12859,22 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -29501,10 +29490,9 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
+@@ -12255,13 +12882,14 @@
+
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
@@ -29522,7 +29510,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -12270,24 +12798,22 @@
+@@ -12270,24 +12898,22 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -29558,7 +29546,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -12295,9 +12821,10 @@
+@@ -12295,9 +12921,10 @@
ac_header_preproc=no
fi
@@ -29571,7 +29559,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -12321,25 +12848,24 @@
+@@ -12321,25 +12948,24 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -29605,7 +29593,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -12359,18 +12885,19 @@
+@@ -12359,18 +12985,19 @@
for ac_header in netinet/in.h arpa/inet.h catamount/data.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -29633,7 +29621,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -12381,41 +12908,37 @@
+@@ -12381,27 +13008,22 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -29672,10 +29660,9 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
+@@ -12409,13 +13031,14 @@
+
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
@@ -29693,7 +29680,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -12424,24 +12947,22 @@
+@@ -12424,24 +13047,22 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -29729,7 +29716,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -12449,9 +12970,10 @@
+@@ -12449,9 +13070,10 @@
ac_header_preproc=no
fi
@@ -29742,7 +29729,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -12475,25 +12997,24 @@
+@@ -12475,25 +13097,24 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -29776,7 +29763,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -12509,9 +13030,9 @@
+@@ -12509,9 +13130,9 @@
for ac_func in inet_ntoa
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -29789,7 +29776,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -12537,68 +13058,60 @@
+@@ -12537,56 +13158,46 @@
#undef $ac_func
@@ -29863,10 +29850,9 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_var=no"
-+ eval "$as_ac_var=no"
+@@ -12594,11 +13205,13 @@
+
+ eval "$as_ac_var=no"
fi
-rm -f conftest.err conftest.$ac_objext \
+
@@ -29881,7 +29867,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -12609,8 +13122,8 @@
+@@ -12609,8 +13222,8 @@
# libsysio/src/readlink.c
@@ -29892,7 +29878,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -12631,30 +13144,25 @@
+@@ -12631,30 +13244,25 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29936,7 +29922,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_POSIX_1003_READLINK 1
-@@ -12666,11 +13174,12 @@
+@@ -12666,11 +13274,12 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29952,7 +29938,7 @@
# utils/llverfs.c
-@@ -12678,18 +13187,19 @@
+@@ -12678,18 +13287,19 @@
for ac_header in ext2fs/ext2fs.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -29980,7 +29966,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -12700,41 +13210,37 @@
+@@ -12700,27 +13310,22 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -30019,10 +30005,9 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
+@@ -12728,13 +13333,14 @@
+
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
@@ -30040,7 +30025,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -12743,24 +13249,22 @@
+@@ -12743,24 +13349,22 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -30076,7 +30061,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -12768,9 +13272,10 @@
+@@ -12768,9 +13372,10 @@
ac_header_preproc=no
fi
@@ -30089,7 +30074,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -12794,25 +13299,24 @@
+@@ -12794,25 +13399,24 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -30123,7 +30108,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -12826,11 +13330,11 @@
+@@ -12826,11 +13430,11 @@
# Super safe df
@@ -30138,7 +30123,7 @@
if test "$enable_mindf" = "yes" ; then
cat >>confdefs.h <<\_ACEOF
-@@ -12839,17 +13343,17 @@
+@@ -12839,17 +13443,17 @@
fi
@@ -30164,7 +30149,7 @@
if test x$enable_fail_alloc != xno ; then
cat >>confdefs.h <<\_ACEOF
-@@ -12861,23 +13365,23 @@
+@@ -12861,23 +13465,23 @@
if test "$SNMP_DIST_SUBDIR" ; then
@@ -30198,7 +30183,7 @@
if test "${ac_cv_prog_NET_SNMP_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -12890,25 +13394,27 @@
+@@ -12890,25 +13494,27 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -30231,7 +30216,7 @@
if test "$NET_SNMP_CONFIG" ; then
NET_SNMP_CFLAGS=$($NET_SNMP_CONFIG --base-cflags)
NET_SNMP_LIBS=$($NET_SNMP_CONFIG --agent-libs)
-@@ -12920,17 +13426,17 @@
+@@ -12920,17 +13526,17 @@
LIBS="$LIBS $NET_SNMP_LIBS"
if test "${ac_cv_header_net_snmp_net_snmp_config_h+set}" = set; then
@@ -30255,7 +30240,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -12941,41 +13447,37 @@
+@@ -12941,27 +13547,22 @@
#include <net-snmp/net-snmp-config.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -30294,10 +30279,9 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
+@@ -12969,13 +13570,14 @@
+
+ ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
@@ -30315,7 +30299,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -12984,24 +13486,22 @@
+@@ -12984,24 +13586,22 @@
/* end confdefs.h. */
#include <net-snmp/net-snmp-config.h>
_ACEOF
@@ -30351,7 +30335,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -13009,9 +13509,10 @@
+@@ -13009,9 +13609,10 @@
ac_header_preproc=no
fi
@@ -30364,7 +30348,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -13035,31 +13536,29 @@
+@@ -13035,31 +13636,29 @@
echo "$as_me: WARNING: net-snmp/net-snmp-config.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: net-snmp/net-snmp-config.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: net-snmp/net-snmp-config.h: in the future, the compiler will take precedence" >&2;}
@@ -30404,7 +30388,7 @@
if test "${ac_cv_func_register_mib+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -13086,68 +13585,59 @@
+@@ -13086,56 +13685,46 @@
#undef register_mib
@@ -30478,10 +30462,9 @@
ac_cv_func_register_mib=yes
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func_register_mib=no
-+ ac_cv_func_register_mib=no
+@@ -13143,11 +13732,12 @@
+
+ ac_cv_func_register_mib=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
@@ -30495,7 +30478,7 @@
if test $ac_cv_func_register_mib = yes; then
SNMP_SUBDIR="snmp"
else
-@@ -13156,8 +13646,8 @@
+@@ -13156,8 +13746,8 @@
NET_SNMP_LISB="$NET_SNMP_LIBS -lwrap"
# fail autoconf's cache
unset ac_cv_func_register_mib
@@ -30506,7 +30489,7 @@
if test "${ac_cv_func_register_mib+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -13184,68 +13674,59 @@
+@@ -13184,56 +13774,46 @@
#undef register_mib
@@ -30580,10 +30563,9 @@
ac_cv_func_register_mib=yes
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func_register_mib=no
-+ ac_cv_func_register_mib=no
+@@ -13241,11 +13821,12 @@
+
+ ac_cv_func_register_mib=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
@@ -30597,7 +30579,7 @@
if test $ac_cv_func_register_mib = yes; then
SNMP_SUBDIR="snmp"
fi
-@@ -13261,14 +13742,14 @@
+@@ -13261,14 +13842,14 @@
LIBS="$LIBS_save"
CPPFLAGS="$CPPFLAGS_save"
fi
@@ -30618,7 +30600,7 @@
if test x$enable_snmp = xyes ; then
{ { echo "$as_me:$LINENO: error: SNMP support was requested, but unavailable" >&5
echo "$as_me: error: SNMP support was requested, but unavailable" >&2;}
-@@ -13390,8 +13871,7 @@
+@@ -13390,8 +13971,7 @@
fi
@@ -30628,53 +30610,7 @@
-@@ -13616,7 +14096,7 @@
-
-
-
-- ac_config_headers="$ac_config_headers config.h"
-+ac_config_headers="$ac_config_headers config.h"
-
- CPPFLAGS="-include \$(top_builddir)/config.h $CPPFLAGS"
- EXTRA_KCFLAGS="-include $PWD/config.h $EXTRA_KCFLAGS"
-@@ -13624,30 +14104,30 @@
-
-
-
-- ac_config_files="$ac_config_files Makefile autoMakefile Rules:build/Rules.in lustre.spec"
-+ac_config_files="$ac_config_files Makefile autoMakefile Rules:build/Rules.in lustre.spec"
-
-
-- ac_config_files="$ac_config_files lnet/Kernelenv lnet/Makefile lnet/autoMakefile lnet/autoconf/Makefile lnet/doc/Makefile lnet/include/Makefile lnet/include/libcfs/Makefile lnet/include/libcfs/linux/Makefile lnet/include/lnet/Makefile lnet/include/lnet/linux/Makefile lnet/klnds/Makefile lnet/klnds/autoMakefile lnet/klnds/gmlnd/Makefile lnet/klnds/mxlnd/autoMakefile lnet/klnds/mxlnd/Makefile lnet/klnds/gmlnd/autoMakefile lnet/klnds/openiblnd/Makefile lnet/klnds/openiblnd/autoMakefile lnet/klnds/o2iblnd/Makefile lnet/klnds/o2iblnd/autoMakefile lnet/klnds/ciblnd/Makefile lnet/klnds/ciblnd/autoMakefile lnet/klnds/iiblnd/Makefile lnet/klnds/iiblnd/autoMakefile lnet/klnds/viblnd/Makefile lnet/klnds/viblnd/autoMakefile lnet/klnds/qswlnd/Makefile lnet/klnds/qswlnd/autoMakefile lnet/klnds/ralnd/Makefile lnet/klnds/ralnd/autoMakefile lnet/klnds/socklnd/Makefile lnet/klnds/socklnd/autoMakefile lnet/klnds/ptllnd/Makefile lnet/klnds/ptllnd/autoMakefile lnet/libcfs/Makefile lnet/libcfs/autoMakefile lnet/libcfs/linux/Makefile lnet/lnet/Makefile lnet/lnet/autoMakefile lnet/selftest/Makefile lnet/selftest/autoMakefile lnet/ulnds/Makefile lnet/ulnds/autoMakefile lnet/ulnds/socklnd/Makefile lnet/ulnds/ptllnd/Makefile lnet/utils/Makefile"
-+ac_config_files="$ac_config_files lnet/Kernelenv lnet/Makefile lnet/autoMakefile lnet/autoconf/Makefile lnet/doc/Makefile lnet/include/Makefile lnet/include/libcfs/Makefile lnet/include/libcfs/linux/Makefile lnet/include/lnet/Makefile lnet/include/lnet/linux/Makefile lnet/klnds/Makefile lnet/klnds/autoMakefile lnet/klnds/gmlnd/Makefile lnet/klnds/mxlnd/autoMakefile lnet/klnds/mxlnd/Makefile lnet/klnds/gmlnd/autoMakefile lnet/klnds/openiblnd/Makefile lnet/klnds/openiblnd/autoMakefile lnet/klnds/o2iblnd/Makefile lnet/klnds/o2iblnd/autoMakefile lnet/klnds/ciblnd/Makefile lnet/klnds/ciblnd/autoMakefile lnet/klnds/iiblnd/Makefile lnet/klnds/iiblnd/autoMakefile lnet/klnds/viblnd/Makefile lnet/klnds/viblnd/autoMakefile lnet/klnds/qswlnd/Makefile lnet/klnds/qswlnd/autoMakefile lnet/klnds/ralnd/Makefile lnet/klnds/ralnd/autoMakefile lnet/klnds/socklnd/Makefile lnet/klnds/socklnd/autoMakefile lnet/klnds/ptllnd/Makefile lnet/klnds/ptllnd/autoMakefile lnet/libcfs/Makefile lnet/libcfs/autoMakefile lnet/libcfs/linux/Makefile lnet/lnet/Makefile lnet/lnet/autoMakefile lnet/selftest/Makefile lnet/selftest/autoMakefile lnet/ulnds/Makefile lnet/ulnds/autoMakefile lnet/ulnds/socklnd/Makefile lnet/ulnds/ptllnd/Makefile lnet/utils/Makefile"
-
- case $lb_target_os in
- darwin)
-- ac_config_files="$ac_config_files lnet/include/libcfs/darwin/Makefile lnet/include/lnet/darwin/Makefile lnet/libcfs/darwin/Makefile"
-+ ac_config_files="$ac_config_files lnet/include/libcfs/darwin/Makefile lnet/include/lnet/darwin/Makefile lnet/libcfs/darwin/Makefile"
-
- ;;
- esac
-
-- ac_config_files="$ac_config_files lustre/Makefile lustre/autoMakefile lustre/autoconf/Makefile lustre/contrib/Makefile lustre/doc/Makefile lustre/include/Makefile lustre/include/lustre_ver.h lustre/include/linux/Makefile lustre/include/lustre/Makefile lustre/kernel_patches/targets/2.6-suse.target lustre/kernel_patches/targets/2.6-vanilla.target lustre/kernel_patches/targets/2.6-rhel4.target lustre/kernel_patches/targets/2.6-rhel5.target lustre/kernel_patches/targets/2.6-fc5.target lustre/kernel_patches/targets/2.6-patchless.target lustre/kernel_patches/targets/2.6-sles10.target lustre/kernel_patches/targets/hp_pnnl-2.4.target lustre/kernel_patches/targets/rh-2.4.target lustre/kernel_patches/targets/rhel-2.4.target lustre/kernel_patches/targets/suse-2.4.21-2.target lustre/kernel_patches/targets/sles-2.4.target lustre/ldlm/Makefile lustre/liblustre/Makefile lustre/liblustre/tests/Makefile lustre/llite/Makefile lustre/llite/autoMakefile lustre/lov/Makefile lustre/lov/autoMakefile lustre/lvfs/Makefile lustre/lvfs/autoMakefile lustre/mdc/Makefile lustre/mdc/autoMakefile lustre/mds/Makefile lustre/mds/autoMakefile lustre/obdclass/Makefile lustre/obdclass/autoMakefile lustre/obdclass/linux/Makefile lustre/obdecho/Makefile lustre/obdecho/autoMakefile lustre/obdfilter/Makefile lustre/obdfilter/autoMakefile lustre/osc/Makefile lustre/osc/autoMakefile lustre/ost/Makefile lustre/ost/autoMakefile lustre/mgc/Makefile lustre/mgc/autoMakefile lustre/mgs/Makefile lustre/mgs/autoMakefile lustre/ptlrpc/Makefile lustre/ptlrpc/autoMakefile lustre/quota/Makefile lustre/quota/autoMakefile lustre/scripts/Makefile lustre/scripts/version_tag.pl lustre/tests/Makefile lustre/utils/Makefile"
-+ac_config_files="$ac_config_files lustre/Makefile lustre/autoMakefile lustre/autoconf/Makefile lustre/contrib/Makefile lustre/doc/Makefile lustre/include/Makefile lustre/include/lustre_ver.h lustre/include/linux/Makefile lustre/include/lustre/Makefile lustre/kernel_patches/targets/2.6-suse.target lustre/kernel_patches/targets/2.6-vanilla.target lustre/kernel_patches/targets/2.6-rhel4.target lustre/kernel_patches/targets/2.6-rhel5.target lustre/kernel_patches/targets/2.6-fc5.target lustre/kernel_patches/targets/2.6-patchless.target lustre/kernel_patches/targets/2.6-sles10.target lustre/kernel_patches/targets/hp_pnnl-2.4.target lustre/kernel_patches/targets/rh-2.4.target lustre/kernel_patches/targets/rhel-2.4.target lustre/kernel_patches/targets/suse-2.4.21-2.target lustre/kernel_patches/targets/sles-2.4.target lustre/ldlm/Makefile lustre/liblustre/Makefile lustre/liblustre/tests/Makefile lustre/llite/Makefile lustre/llite/autoMakefile lustre/lov/Makefile lustre/lov/autoMakefile lustre/lvfs/Makefile lustre/lvfs/autoMakefile lustre/mdc/Makefile lustre/mdc/autoMakefile lustre/mds/Makefile lustre/mds/autoMakefile lustre/obdclass/Makefile lustre/obdclass/autoMakefile lustre/obdclass/linux/Makefile lustre/obdecho/Makefile lustre/obdecho/autoMakefile lustre/obdfilter/Makefile lustre/obdfilter/autoMakefile lustre/osc/Makefile lustre/osc/autoMakefile lustre/ost/Makefile lustre/ost/autoMakefile lustre/mgc/Makefile lustre/mgc/autoMakefile lustre/mgs/Makefile lustre/mgs/autoMakefile lustre/ptlrpc/Makefile lustre/ptlrpc/autoMakefile lustre/quota/Makefile lustre/quota/autoMakefile lustre/scripts/Makefile lustre/scripts/version_tag.pl lustre/tests/Makefile lustre/utils/Makefile"
-
- case $lb_target_os in
- darwin)
-- ac_config_files="$ac_config_files lustre/obdclass/darwin/Makefile"
-+ ac_config_files="$ac_config_files lustre/obdclass/darwin/Makefile"
-
- ;;
- esac
-
-
- if test "$SNMP_DIST_SUBDIR" ; then
-- ac_config_files="$ac_config_files snmp/Makefile snmp/autoconf/Makefile"
-+ ac_config_files="$ac_config_files snmp/Makefile snmp/autoconf/Makefile"
-
-
- fi
-@@ -13675,39 +14155,58 @@
+@@ -13675,39 +14255,58 @@
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -30725,17 +30661,15 @@
sed '
+ /^ac_cv_env_/b end
t clear
-- : clear
-+ :clear
+ : clear
s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
t end
- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-- : end' >>confcache
++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+ : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
- if test -w $cache_file; then
- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+ :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+ if test -w "$cache_file"; then
+ test "x$cache_file" != "x/dev/null" &&
@@ -30749,7 +30683,7 @@
fi
fi
rm -f confcache
-@@ -13716,32 +14215,18 @@
+@@ -13716,32 +14315,18 @@
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -30788,7 +30722,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -14003,17 +14488,45 @@
+@@ -14003,73 +14588,26 @@
## M4sh Initialization. ##
## --------------------- ##
@@ -30803,45 +30737,91 @@
alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
- set -o posix
+-fi
+-DUALCASE=1; export DUALCASE # for MKS sh
+-
+-# Support unset when possible.
+-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+- as_unset=unset
+-else
+- as_unset=false
+-fi
+-
+-
+-# Work around bugs in pre-3.0 UWIN ksh.
+-$as_unset ENV MAIL MAILPATH
+-PS1='$ '
+-PS2='> '
+-PS4='+ '
+-
+-# NLS nuisances.
+-for as_var in \
+- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+- LC_TELEPHONE LC_TIME
+-do
+- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+- eval $as_var=C; export $as_var
+- else
+- $as_unset $as_var
+- fi
+-done
+-
+-# Required to use basename.
+-if expr a : '\(a\)' >/dev/null 2>&1; then
+- as_expr=expr
+ setopt NO_GLOB_SUBST
-+else
+ else
+- as_expr=false
+-fi
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
-+
-+fi
-+
-+
-+
-+
+
+-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+- as_basename=basename
+-else
+- as_basename=false
+ fi
+
+
+-# Name of the executable.
+-as_me=`$as_basename "$0" ||
+-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+- X"$0" : 'X\(//\)$' \| \
+- X"$0" : 'X\(/\)$' \| \
+- . : '\(.\)' 2>/dev/null ||
+-echo X/"$0" |
+- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+- /^X\/\(\/\/\)$/{ s//\1/; q; }
+- /^X\/\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+
+
+-# PATH needs CR, and LINENO needs CR and PATH.
+# PATH needs CR
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+ echo "#! /bin/sh" >conf$$.sh
-+ echo "exit 0" >>conf$$.sh
-+ chmod +x conf$$.sh
-+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+ PATH_SEPARATOR=';'
-+ else
-+ PATH_SEPARATOR=:
-+ fi
-+ rm -f conf$$.sh
+ # Avoid depending upon Character Ranges.
+ as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+ as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+@@ -14090,14 +14628,24 @@
+ rm -f conf$$.sh
fi
--DUALCASE=1; export DUALCASE # for MKS sh
-
- # Support unset when possible.
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -14023,8 +14536,43 @@
- fi
-
-
+
++# Support unset when possible.
++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
++ as_unset=unset
++else
++ as_unset=false
++fi
+
+- as_lineno_1=$LINENO
+- as_lineno_2=$LINENO
+- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+- test "x$as_lineno_1" != "x$as_lineno_2" &&
+- test "x$as_lineno_3" = "x$as_lineno_2" || {
+- # Find who we are. Look in the path if we contain no path at all
+- # relative or not.
++
+# IFS
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent editors from complaining about space-tab.
@@ -30852,76 +30832,80 @@
+IFS=" "" $as_nl"
+
+# Find who we are. Look in the path if we contain no directory separator.
-+case $0 in
-+ *[\\/]* ) as_myself=$0 ;;
-+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
+ case $0 in
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -14107,6 +14655,7 @@
+ test -z "$as_dir" && as_dir=.
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
+IFS=$as_save_IFS
-+
-+ ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+ as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
+
+ ;;
+ esac
+@@ -14116,100 +14665,161 @@
+ as_myself=$0
+ fi
+ if test ! -f "$as_myself"; then
+- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
+-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
+- { (exit 1); exit 1; }; }
+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ { (exit 1); exit 1; }
-+fi
-+
- # Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
+ fi
+- case $CONFIG_SHELL in
+- '')
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++
++# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
- PS1='$ '
- PS2='> '
- PS4='+ '
-@@ -14038,18 +14586,19 @@
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
-- $as_unset $as_var
++PS1='$ '
++PS2='> '
++PS4='+ '
++
++# NLS nuisances.
++for as_var in \
++ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++ LC_TELEPHONE LC_TIME
+ do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for as_base in sh bash ksh sh5; do
+- case $as_dir in
+- /*)
+- if ("$as_dir/$as_base" -c '
++ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
++ eval $as_var=C; export $as_var
++ else
+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
- done
-
- # Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
++ fi
++done
++
++# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
- else
- as_expr=false
- fi
-
--if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++ as_expr=expr
++else
++ as_expr=false
++fi
++
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
- else
- as_basename=false
-@@ -14057,159 +14606,120 @@
-
-
- # Name of the executable.
--as_me=`$as_basename "$0" ||
++ as_basename=basename
++else
++ as_basename=false
++fi
++
++
++# Name of the executable.
+as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)$' \| \
-- . : '\(.\)' 2>/dev/null ||
++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
++ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X/"$0" |
-- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-- /^X\/\(\/\/\)$/{ s//\1/; q; }
-- /^X\/\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
++echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
@@ -30935,76 +30919,16 @@
+ q
+ }
+ s/.*/./; q'`
-
++
+# CDPATH.
+$as_unset CDPATH
-
--# PATH needs CR, and LINENO needs CR and PATH.
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
--
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
-- echo "#! /bin/sh" >conf$$.sh
-- echo "exit 0" >>conf$$.sh
-- chmod +x conf$$.sh
-- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-- PATH_SEPARATOR=';'
-- else
-- PATH_SEPARATOR=:
-- fi
-- rm -f conf$$.sh
--fi
-
-
++
++
++
as_lineno_1=$LINENO
as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
test "x$as_lineno_1" != "x$as_lineno_2" &&
-- test "x$as_lineno_3" = "x$as_lineno_2" || {
-- # Find who we are. Look in the path if we contain no path at all
-- # relative or not.
-- case $0 in
-- *[\\/]* ) as_myself=$0 ;;
-- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
--done
--
-- ;;
-- esac
-- # We did not find ourselves, most probably we were run as `sh COMMAND'
-- # in which case we are not to be found in the path.
-- if test "x$as_myself" = x; then
-- as_myself=$0
-- fi
-- if test ! -f "$as_myself"; then
-- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
--echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-- { (exit 1); exit 1; }; }
-- fi
-- case $CONFIG_SHELL in
-- '')
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for as_base in sh bash ksh sh5; do
-- case $as_dir in
-- /*)
-- if ("$as_dir/$as_base" -c '
-- as_lineno_1=$LINENO
-- as_lineno_2=$LINENO
-- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
@@ -31046,9 +30970,8 @@
+ :lineno
N
- s,$,-,
-- : loop
+ : loop
- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+ :loop
+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
t loop
- s,-$,,
@@ -31116,16 +31039,16 @@
- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
- if test -f conf$$.exe; then
- # Don't use ln at all; we don't have any links
-+ as_ln_s='ln -s'
+- as_ln_s='cp -p'
+- else
+ as_ln_s='ln -s'
+- fi
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
-- else
-- as_ln_s='ln -s'
-- fi
++ as_ln_s='cp -p'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
@@ -31137,7 +31060,7 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
-@@ -14218,7 +14728,28 @@
+@@ -14218,7 +14828,28 @@
as_mkdir_p=false
fi
@@ -31167,7 +31090,7 @@
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -14227,31 +14758,14 @@
+@@ -14227,31 +14858,14 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -31203,7 +31126,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -14259,30 +14773,20 @@
+@@ -14259,30 +14873,20 @@
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -31242,7 +31165,7 @@
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -14290,7 +14794,7 @@
+@@ -14290,7 +14894,7 @@
Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
@@ -31251,7 +31174,7 @@
-q, --quiet do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
-@@ -14309,19 +14813,21 @@
+@@ -14309,19 +14913,21 @@
$config_commands
Report bugs to <bug-autoconf at gnu.org>."
@@ -31279,7 +31202,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -14332,39 +14838,24 @@
+@@ -14332,39 +14938,24 @@
do
case $1 in
--*=*)
@@ -31325,7 +31248,7 @@
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
-@@ -14374,18 +14865,24 @@
+@@ -14374,18 +14965,24 @@
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
@@ -31355,7 +31278,7 @@
esac
shift
-@@ -14401,149 +14898,161 @@
+@@ -14401,28 +14998,40 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
@@ -31398,237 +31321,18 @@
do
- case "$ac_config_target" in
- # Handling of arguments.
-- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-- "autoMakefile" ) CONFIG_FILES="$CONFIG_FILES autoMakefile" ;;
-- "Rules" ) CONFIG_FILES="$CONFIG_FILES Rules:build/Rules.in" ;;
-- "lustre.spec" ) CONFIG_FILES="$CONFIG_FILES lustre.spec" ;;
-- "lnet/Kernelenv" ) CONFIG_FILES="$CONFIG_FILES lnet/Kernelenv" ;;
-- "lnet/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/Makefile" ;;
-- "lnet/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lnet/autoMakefile" ;;
-- "lnet/autoconf/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/autoconf/Makefile" ;;
-- "lnet/doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/doc/Makefile" ;;
-- "lnet/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/include/Makefile" ;;
-- "lnet/include/libcfs/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/include/libcfs/Makefile" ;;
-- "lnet/include/libcfs/linux/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/include/libcfs/linux/Makefile" ;;
-- "lnet/include/lnet/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/include/lnet/Makefile" ;;
-- "lnet/include/lnet/linux/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/include/lnet/linux/Makefile" ;;
-- "lnet/klnds/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/klnds/Makefile" ;;
-- "lnet/klnds/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lnet/klnds/autoMakefile" ;;
-- "lnet/klnds/gmlnd/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/klnds/gmlnd/Makefile" ;;
-- "lnet/klnds/mxlnd/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lnet/klnds/mxlnd/autoMakefile" ;;
-- "lnet/klnds/mxlnd/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/klnds/mxlnd/Makefile" ;;
-- "lnet/klnds/gmlnd/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lnet/klnds/gmlnd/autoMakefile" ;;
-- "lnet/klnds/openiblnd/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/klnds/openiblnd/Makefile" ;;
-- "lnet/klnds/openiblnd/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lnet/klnds/openiblnd/autoMakefile" ;;
-- "lnet/klnds/o2iblnd/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/klnds/o2iblnd/Makefile" ;;
-- "lnet/klnds/o2iblnd/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lnet/klnds/o2iblnd/autoMakefile" ;;
-- "lnet/klnds/ciblnd/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/klnds/ciblnd/Makefile" ;;
-- "lnet/klnds/ciblnd/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lnet/klnds/ciblnd/autoMakefile" ;;
-- "lnet/klnds/iiblnd/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/klnds/iiblnd/Makefile" ;;
-- "lnet/klnds/iiblnd/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lnet/klnds/iiblnd/autoMakefile" ;;
-- "lnet/klnds/viblnd/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/klnds/viblnd/Makefile" ;;
-- "lnet/klnds/viblnd/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lnet/klnds/viblnd/autoMakefile" ;;
-- "lnet/klnds/qswlnd/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/klnds/qswlnd/Makefile" ;;
-- "lnet/klnds/qswlnd/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lnet/klnds/qswlnd/autoMakefile" ;;
-- "lnet/klnds/ralnd/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/klnds/ralnd/Makefile" ;;
-- "lnet/klnds/ralnd/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lnet/klnds/ralnd/autoMakefile" ;;
-- "lnet/klnds/socklnd/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/klnds/socklnd/Makefile" ;;
-- "lnet/klnds/socklnd/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lnet/klnds/socklnd/autoMakefile" ;;
-- "lnet/klnds/ptllnd/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/klnds/ptllnd/Makefile" ;;
-- "lnet/klnds/ptllnd/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lnet/klnds/ptllnd/autoMakefile" ;;
-- "lnet/libcfs/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/libcfs/Makefile" ;;
-- "lnet/libcfs/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lnet/libcfs/autoMakefile" ;;
-- "lnet/libcfs/linux/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/libcfs/linux/Makefile" ;;
-- "lnet/lnet/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/lnet/Makefile" ;;
-- "lnet/lnet/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lnet/lnet/autoMakefile" ;;
-- "lnet/selftest/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/selftest/Makefile" ;;
-- "lnet/selftest/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lnet/selftest/autoMakefile" ;;
-- "lnet/ulnds/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/ulnds/Makefile" ;;
-- "lnet/ulnds/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lnet/ulnds/autoMakefile" ;;
-- "lnet/ulnds/socklnd/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/ulnds/socklnd/Makefile" ;;
-- "lnet/ulnds/ptllnd/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/ulnds/ptllnd/Makefile" ;;
-- "lnet/utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/utils/Makefile" ;;
-- "lnet/include/libcfs/darwin/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/include/libcfs/darwin/Makefile" ;;
-- "lnet/include/lnet/darwin/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/include/lnet/darwin/Makefile" ;;
-- "lnet/libcfs/darwin/Makefile" ) CONFIG_FILES="$CONFIG_FILES lnet/libcfs/darwin/Makefile" ;;
-- "lustre/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/Makefile" ;;
-- "lustre/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lustre/autoMakefile" ;;
-- "lustre/autoconf/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/autoconf/Makefile" ;;
-- "lustre/contrib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/contrib/Makefile" ;;
-- "lustre/doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/doc/Makefile" ;;
-- "lustre/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/include/Makefile" ;;
-- "lustre/include/lustre_ver.h" ) CONFIG_FILES="$CONFIG_FILES lustre/include/lustre_ver.h" ;;
-- "lustre/include/linux/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/include/linux/Makefile" ;;
-- "lustre/include/lustre/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/include/lustre/Makefile" ;;
-- "lustre/kernel_patches/targets/2.6-suse.target" ) CONFIG_FILES="$CONFIG_FILES lustre/kernel_patches/targets/2.6-suse.target" ;;
-- "lustre/kernel_patches/targets/2.6-vanilla.target" ) CONFIG_FILES="$CONFIG_FILES lustre/kernel_patches/targets/2.6-vanilla.target" ;;
-- "lustre/kernel_patches/targets/2.6-rhel4.target" ) CONFIG_FILES="$CONFIG_FILES lustre/kernel_patches/targets/2.6-rhel4.target" ;;
-- "lustre/kernel_patches/targets/2.6-rhel5.target" ) CONFIG_FILES="$CONFIG_FILES lustre/kernel_patches/targets/2.6-rhel5.target" ;;
-- "lustre/kernel_patches/targets/2.6-fc5.target" ) CONFIG_FILES="$CONFIG_FILES lustre/kernel_patches/targets/2.6-fc5.target" ;;
-- "lustre/kernel_patches/targets/2.6-patchless.target" ) CONFIG_FILES="$CONFIG_FILES lustre/kernel_patches/targets/2.6-patchless.target" ;;
-- "lustre/kernel_patches/targets/2.6-sles10.target" ) CONFIG_FILES="$CONFIG_FILES lustre/kernel_patches/targets/2.6-sles10.target" ;;
-- "lustre/kernel_patches/targets/hp_pnnl-2.4.target" ) CONFIG_FILES="$CONFIG_FILES lustre/kernel_patches/targets/hp_pnnl-2.4.target" ;;
-- "lustre/kernel_patches/targets/rh-2.4.target" ) CONFIG_FILES="$CONFIG_FILES lustre/kernel_patches/targets/rh-2.4.target" ;;
-- "lustre/kernel_patches/targets/rhel-2.4.target" ) CONFIG_FILES="$CONFIG_FILES lustre/kernel_patches/targets/rhel-2.4.target" ;;
-- "lustre/kernel_patches/targets/suse-2.4.21-2.target" ) CONFIG_FILES="$CONFIG_FILES lustre/kernel_patches/targets/suse-2.4.21-2.target" ;;
-- "lustre/kernel_patches/targets/sles-2.4.target" ) CONFIG_FILES="$CONFIG_FILES lustre/kernel_patches/targets/sles-2.4.target" ;;
-- "lustre/ldlm/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/ldlm/Makefile" ;;
-- "lustre/liblustre/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/liblustre/Makefile" ;;
-- "lustre/liblustre/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/liblustre/tests/Makefile" ;;
-- "lustre/llite/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/llite/Makefile" ;;
-- "lustre/llite/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lustre/llite/autoMakefile" ;;
-- "lustre/lov/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/lov/Makefile" ;;
-- "lustre/lov/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lustre/lov/autoMakefile" ;;
-- "lustre/lvfs/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/lvfs/Makefile" ;;
-- "lustre/lvfs/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lustre/lvfs/autoMakefile" ;;
-- "lustre/mdc/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/mdc/Makefile" ;;
-- "lustre/mdc/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lustre/mdc/autoMakefile" ;;
-- "lustre/mds/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/mds/Makefile" ;;
-- "lustre/mds/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lustre/mds/autoMakefile" ;;
-- "lustre/obdclass/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/obdclass/Makefile" ;;
-- "lustre/obdclass/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lustre/obdclass/autoMakefile" ;;
-- "lustre/obdclass/linux/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/obdclass/linux/Makefile" ;;
-- "lustre/obdecho/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/obdecho/Makefile" ;;
-- "lustre/obdecho/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lustre/obdecho/autoMakefile" ;;
-- "lustre/obdfilter/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/obdfilter/Makefile" ;;
-- "lustre/obdfilter/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lustre/obdfilter/autoMakefile" ;;
-- "lustre/osc/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/osc/Makefile" ;;
-- "lustre/osc/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lustre/osc/autoMakefile" ;;
-- "lustre/ost/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/ost/Makefile" ;;
-- "lustre/ost/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lustre/ost/autoMakefile" ;;
-- "lustre/mgc/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/mgc/Makefile" ;;
-- "lustre/mgc/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lustre/mgc/autoMakefile" ;;
-- "lustre/mgs/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/mgs/Makefile" ;;
-- "lustre/mgs/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lustre/mgs/autoMakefile" ;;
-- "lustre/ptlrpc/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/ptlrpc/Makefile" ;;
-- "lustre/ptlrpc/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lustre/ptlrpc/autoMakefile" ;;
-- "lustre/quota/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/quota/Makefile" ;;
-- "lustre/quota/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES lustre/quota/autoMakefile" ;;
-- "lustre/scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/scripts/Makefile" ;;
-- "lustre/scripts/version_tag.pl" ) CONFIG_FILES="$CONFIG_FILES lustre/scripts/version_tag.pl" ;;
-- "lustre/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/tests/Makefile" ;;
-- "lustre/utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/utils/Makefile" ;;
-- "lustre/obdclass/darwin/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/obdclass/darwin/Makefile" ;;
-- "snmp/Makefile" ) CONFIG_FILES="$CONFIG_FILES snmp/Makefile" ;;
-- "snmp/autoconf/Makefile" ) CONFIG_FILES="$CONFIG_FILES snmp/autoconf/Makefile" ;;
-- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+ case $ac_config_target in
+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-+ "autoMakefile") CONFIG_FILES="$CONFIG_FILES autoMakefile" ;;
-+ "Rules") CONFIG_FILES="$CONFIG_FILES Rules:build/Rules.in" ;;
-+ "lustre.spec") CONFIG_FILES="$CONFIG_FILES lustre.spec" ;;
-+ "lnet/Kernelenv") CONFIG_FILES="$CONFIG_FILES lnet/Kernelenv" ;;
-+ "lnet/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/Makefile" ;;
-+ "lnet/autoMakefile") CONFIG_FILES="$CONFIG_FILES lnet/autoMakefile" ;;
-+ "lnet/autoconf/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/autoconf/Makefile" ;;
-+ "lnet/doc/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/doc/Makefile" ;;
-+ "lnet/include/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/include/Makefile" ;;
-+ "lnet/include/libcfs/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/include/libcfs/Makefile" ;;
-+ "lnet/include/libcfs/linux/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/include/libcfs/linux/Makefile" ;;
-+ "lnet/include/lnet/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/include/lnet/Makefile" ;;
-+ "lnet/include/lnet/linux/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/include/lnet/linux/Makefile" ;;
-+ "lnet/klnds/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/klnds/Makefile" ;;
-+ "lnet/klnds/autoMakefile") CONFIG_FILES="$CONFIG_FILES lnet/klnds/autoMakefile" ;;
-+ "lnet/klnds/gmlnd/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/klnds/gmlnd/Makefile" ;;
-+ "lnet/klnds/mxlnd/autoMakefile") CONFIG_FILES="$CONFIG_FILES lnet/klnds/mxlnd/autoMakefile" ;;
-+ "lnet/klnds/mxlnd/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/klnds/mxlnd/Makefile" ;;
-+ "lnet/klnds/gmlnd/autoMakefile") CONFIG_FILES="$CONFIG_FILES lnet/klnds/gmlnd/autoMakefile" ;;
-+ "lnet/klnds/openiblnd/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/klnds/openiblnd/Makefile" ;;
-+ "lnet/klnds/openiblnd/autoMakefile") CONFIG_FILES="$CONFIG_FILES lnet/klnds/openiblnd/autoMakefile" ;;
-+ "lnet/klnds/o2iblnd/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/klnds/o2iblnd/Makefile" ;;
-+ "lnet/klnds/o2iblnd/autoMakefile") CONFIG_FILES="$CONFIG_FILES lnet/klnds/o2iblnd/autoMakefile" ;;
-+ "lnet/klnds/ciblnd/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/klnds/ciblnd/Makefile" ;;
-+ "lnet/klnds/ciblnd/autoMakefile") CONFIG_FILES="$CONFIG_FILES lnet/klnds/ciblnd/autoMakefile" ;;
-+ "lnet/klnds/iiblnd/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/klnds/iiblnd/Makefile" ;;
-+ "lnet/klnds/iiblnd/autoMakefile") CONFIG_FILES="$CONFIG_FILES lnet/klnds/iiblnd/autoMakefile" ;;
-+ "lnet/klnds/viblnd/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/klnds/viblnd/Makefile" ;;
-+ "lnet/klnds/viblnd/autoMakefile") CONFIG_FILES="$CONFIG_FILES lnet/klnds/viblnd/autoMakefile" ;;
-+ "lnet/klnds/qswlnd/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/klnds/qswlnd/Makefile" ;;
-+ "lnet/klnds/qswlnd/autoMakefile") CONFIG_FILES="$CONFIG_FILES lnet/klnds/qswlnd/autoMakefile" ;;
-+ "lnet/klnds/ralnd/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/klnds/ralnd/Makefile" ;;
-+ "lnet/klnds/ralnd/autoMakefile") CONFIG_FILES="$CONFIG_FILES lnet/klnds/ralnd/autoMakefile" ;;
-+ "lnet/klnds/socklnd/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/klnds/socklnd/Makefile" ;;
-+ "lnet/klnds/socklnd/autoMakefile") CONFIG_FILES="$CONFIG_FILES lnet/klnds/socklnd/autoMakefile" ;;
-+ "lnet/klnds/ptllnd/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/klnds/ptllnd/Makefile" ;;
-+ "lnet/klnds/ptllnd/autoMakefile") CONFIG_FILES="$CONFIG_FILES lnet/klnds/ptllnd/autoMakefile" ;;
-+ "lnet/libcfs/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/libcfs/Makefile" ;;
-+ "lnet/libcfs/autoMakefile") CONFIG_FILES="$CONFIG_FILES lnet/libcfs/autoMakefile" ;;
-+ "lnet/libcfs/linux/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/libcfs/linux/Makefile" ;;
-+ "lnet/lnet/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/lnet/Makefile" ;;
-+ "lnet/lnet/autoMakefile") CONFIG_FILES="$CONFIG_FILES lnet/lnet/autoMakefile" ;;
-+ "lnet/selftest/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/selftest/Makefile" ;;
-+ "lnet/selftest/autoMakefile") CONFIG_FILES="$CONFIG_FILES lnet/selftest/autoMakefile" ;;
-+ "lnet/ulnds/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/ulnds/Makefile" ;;
-+ "lnet/ulnds/autoMakefile") CONFIG_FILES="$CONFIG_FILES lnet/ulnds/autoMakefile" ;;
-+ "lnet/ulnds/socklnd/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/ulnds/socklnd/Makefile" ;;
-+ "lnet/ulnds/ptllnd/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/ulnds/ptllnd/Makefile" ;;
-+ "lnet/utils/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/utils/Makefile" ;;
-+ "lnet/include/libcfs/darwin/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/include/libcfs/darwin/Makefile" ;;
-+ "lnet/include/lnet/darwin/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/include/lnet/darwin/Makefile" ;;
-+ "lnet/libcfs/darwin/Makefile") CONFIG_FILES="$CONFIG_FILES lnet/libcfs/darwin/Makefile" ;;
-+ "lustre/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/Makefile" ;;
-+ "lustre/autoMakefile") CONFIG_FILES="$CONFIG_FILES lustre/autoMakefile" ;;
-+ "lustre/autoconf/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/autoconf/Makefile" ;;
-+ "lustre/contrib/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/contrib/Makefile" ;;
-+ "lustre/doc/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/doc/Makefile" ;;
-+ "lustre/include/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/include/Makefile" ;;
-+ "lustre/include/lustre_ver.h") CONFIG_FILES="$CONFIG_FILES lustre/include/lustre_ver.h" ;;
-+ "lustre/include/linux/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/include/linux/Makefile" ;;
-+ "lustre/include/lustre/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/include/lustre/Makefile" ;;
-+ "lustre/kernel_patches/targets/2.6-suse.target") CONFIG_FILES="$CONFIG_FILES lustre/kernel_patches/targets/2.6-suse.target" ;;
-+ "lustre/kernel_patches/targets/2.6-vanilla.target") CONFIG_FILES="$CONFIG_FILES lustre/kernel_patches/targets/2.6-vanilla.target" ;;
-+ "lustre/kernel_patches/targets/2.6-rhel4.target") CONFIG_FILES="$CONFIG_FILES lustre/kernel_patches/targets/2.6-rhel4.target" ;;
-+ "lustre/kernel_patches/targets/2.6-rhel5.target") CONFIG_FILES="$CONFIG_FILES lustre/kernel_patches/targets/2.6-rhel5.target" ;;
-+ "lustre/kernel_patches/targets/2.6-fc5.target") CONFIG_FILES="$CONFIG_FILES lustre/kernel_patches/targets/2.6-fc5.target" ;;
-+ "lustre/kernel_patches/targets/2.6-patchless.target") CONFIG_FILES="$CONFIG_FILES lustre/kernel_patches/targets/2.6-patchless.target" ;;
-+ "lustre/kernel_patches/targets/2.6-sles10.target") CONFIG_FILES="$CONFIG_FILES lustre/kernel_patches/targets/2.6-sles10.target" ;;
-+ "lustre/kernel_patches/targets/hp_pnnl-2.4.target") CONFIG_FILES="$CONFIG_FILES lustre/kernel_patches/targets/hp_pnnl-2.4.target" ;;
-+ "lustre/kernel_patches/targets/rh-2.4.target") CONFIG_FILES="$CONFIG_FILES lustre/kernel_patches/targets/rh-2.4.target" ;;
-+ "lustre/kernel_patches/targets/rhel-2.4.target") CONFIG_FILES="$CONFIG_FILES lustre/kernel_patches/targets/rhel-2.4.target" ;;
-+ "lustre/kernel_patches/targets/suse-2.4.21-2.target") CONFIG_FILES="$CONFIG_FILES lustre/kernel_patches/targets/suse-2.4.21-2.target" ;;
-+ "lustre/kernel_patches/targets/sles-2.4.target") CONFIG_FILES="$CONFIG_FILES lustre/kernel_patches/targets/sles-2.4.target" ;;
-+ "lustre/ldlm/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/ldlm/Makefile" ;;
-+ "lustre/liblustre/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/liblustre/Makefile" ;;
-+ "lustre/liblustre/tests/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/liblustre/tests/Makefile" ;;
-+ "lustre/llite/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/llite/Makefile" ;;
-+ "lustre/llite/autoMakefile") CONFIG_FILES="$CONFIG_FILES lustre/llite/autoMakefile" ;;
-+ "lustre/lov/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/lov/Makefile" ;;
-+ "lustre/lov/autoMakefile") CONFIG_FILES="$CONFIG_FILES lustre/lov/autoMakefile" ;;
-+ "lustre/lvfs/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/lvfs/Makefile" ;;
-+ "lustre/lvfs/autoMakefile") CONFIG_FILES="$CONFIG_FILES lustre/lvfs/autoMakefile" ;;
-+ "lustre/mdc/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/mdc/Makefile" ;;
-+ "lustre/mdc/autoMakefile") CONFIG_FILES="$CONFIG_FILES lustre/mdc/autoMakefile" ;;
-+ "lustre/mds/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/mds/Makefile" ;;
-+ "lustre/mds/autoMakefile") CONFIG_FILES="$CONFIG_FILES lustre/mds/autoMakefile" ;;
-+ "lustre/obdclass/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/obdclass/Makefile" ;;
-+ "lustre/obdclass/autoMakefile") CONFIG_FILES="$CONFIG_FILES lustre/obdclass/autoMakefile" ;;
-+ "lustre/obdclass/linux/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/obdclass/linux/Makefile" ;;
-+ "lustre/obdecho/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/obdecho/Makefile" ;;
-+ "lustre/obdecho/autoMakefile") CONFIG_FILES="$CONFIG_FILES lustre/obdecho/autoMakefile" ;;
-+ "lustre/obdfilter/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/obdfilter/Makefile" ;;
-+ "lustre/obdfilter/autoMakefile") CONFIG_FILES="$CONFIG_FILES lustre/obdfilter/autoMakefile" ;;
-+ "lustre/osc/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/osc/Makefile" ;;
-+ "lustre/osc/autoMakefile") CONFIG_FILES="$CONFIG_FILES lustre/osc/autoMakefile" ;;
-+ "lustre/ost/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/ost/Makefile" ;;
-+ "lustre/ost/autoMakefile") CONFIG_FILES="$CONFIG_FILES lustre/ost/autoMakefile" ;;
-+ "lustre/mgc/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/mgc/Makefile" ;;
-+ "lustre/mgc/autoMakefile") CONFIG_FILES="$CONFIG_FILES lustre/mgc/autoMakefile" ;;
-+ "lustre/mgs/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/mgs/Makefile" ;;
-+ "lustre/mgs/autoMakefile") CONFIG_FILES="$CONFIG_FILES lustre/mgs/autoMakefile" ;;
-+ "lustre/ptlrpc/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/ptlrpc/Makefile" ;;
-+ "lustre/ptlrpc/autoMakefile") CONFIG_FILES="$CONFIG_FILES lustre/ptlrpc/autoMakefile" ;;
-+ "lustre/quota/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/quota/Makefile" ;;
-+ "lustre/quota/autoMakefile") CONFIG_FILES="$CONFIG_FILES lustre/quota/autoMakefile" ;;
-+ "lustre/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/scripts/Makefile" ;;
-+ "lustre/scripts/version_tag.pl") CONFIG_FILES="$CONFIG_FILES lustre/scripts/version_tag.pl" ;;
-+ "lustre/tests/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/tests/Makefile" ;;
-+ "lustre/utils/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/utils/Makefile" ;;
-+ "lustre/obdclass/darwin/Makefile") CONFIG_FILES="$CONFIG_FILES lustre/obdclass/darwin/Makefile" ;;
-+ "snmp/Makefile") CONFIG_FILES="$CONFIG_FILES snmp/Makefile" ;;
-+ "snmp/autoconf/Makefile") CONFIG_FILES="$CONFIG_FILES snmp/autoconf/Makefile" ;;
+ "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+ "autoMakefile" ) CONFIG_FILES="$CONFIG_FILES autoMakefile" ;;
+ "Rules" ) CONFIG_FILES="$CONFIG_FILES Rules:build/Rules.in" ;;
+@@ -14536,14 +15145,14 @@
+ "lustre/obdclass/darwin/Makefile" ) CONFIG_FILES="$CONFIG_FILES lustre/obdclass/darwin/Makefile" ;;
+ "snmp/Makefile" ) CONFIG_FILES="$CONFIG_FILES snmp/Makefile" ;;
+ "snmp/autoconf/Makefile" ) CONFIG_FILES="$CONFIG_FILES snmp/autoconf/Makefile" ;;
+- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -31640,7 +31344,7 @@
# If the user did not use the arguments to specify the items to instantiate,
# then the envvar interface is used. Set only those that are not.
# We use the long form for the default assignment because of an extremely
-@@ -14555,732 +15064,756 @@
+@@ -14555,483 +15164,625 @@
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -31940,30 +31644,6 @@
- while $ac_more_lines; do
- if test $ac_beg -gt 1; then
- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-- else
-- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-- fi
-- if test ! -s $tmp/subs.frag; then
-- ac_more_lines=false
-- else
-- # The purpose of the label and of the branching condition is to
-- # speed up the sed processing (if there are no `@' at all, there
-- # is no need to browse any of the substitutions).
-- # These are the two extra sed commands mentioned above.
-- (echo ':t
-- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-- if test -z "$ac_sed_cmds"; then
-- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-- else
-- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-- fi
-- ac_sed_frag=`expr $ac_sed_frag + 1`
-- ac_beg=$ac_end
-- ac_end=`expr $ac_end + $ac_max_sed_lines`
-- fi
-- done
-- if test -z "$ac_sed_cmds"; then
-- ac_sed_cmds=cat
+
+
+ac_delim='%!_!# '
@@ -32074,12 +31754,23 @@
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
-+ else
+ else
+- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
--fi # test -n "$CONFIG_FILES"
+ fi
+- if test ! -s $tmp/subs.frag; then
+- ac_more_lines=false
+- else
+- # The purpose of the label and of the branching condition is to
+- # speed up the sed processing (if there are no `@' at all, there
+- # is no need to browse any of the substitutions).
+- # These are the two extra sed commands mentioned above.
+- (echo ':t
+- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+- if test -z "$ac_sed_cmds"; then
+- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+done
-
++
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
@@ -32102,7 +31793,7 @@
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
- _ACEOF
++_ACEOF
+
+
+ac_delim='%!_!# '
@@ -32213,9 +31904,13 @@
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
-+ else
+ else
+- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+ fi
+ fi
+- ac_sed_frag=`expr $ac_sed_frag + 1`
+- ac_beg=$ac_end
+- ac_end=`expr $ac_end + $ac_max_sed_lines`
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
@@ -32291,15 +31986,18 @@
+ { (exit 1); exit 1; }; }
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+ fi
-+done
+ fi
+ done
+- if test -z "$ac_sed_cmds"; then
+- ac_sed_cmds=cat
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+ ac_eof=`expr $ac_eof + 1`
-+fi
-+
+ fi
+-fi # test -n "$CONFIG_FILES"
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
@@ -32318,7 +32016,7 @@
+:end
+s/|#_!!_#|//g
+CEOF$ac_eof
-+_ACEOF
+ _ACEOF
+
+
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
@@ -32354,7 +32052,7 @@
+do
+ case $ac_tag in
+ :[FHLC]) ac_mode=$ac_tag; continue;;
- esac
++ esac
+ case $ac_mode$ac_tag in
+ :[FHL]*:*);;
+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
@@ -32362,7 +32060,7 @@
+ { (exit 1); exit 1; }; };;
+ :[FH]-) ac_tag=-:-;;
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-+ esac
+ esac
+ ac_save_IFS=$IFS
+ IFS=:
+ set x $ac_tag
@@ -32425,11 +32123,6 @@
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-- { if $as_mkdir_p; then
-- mkdir -p "$ac_dir"
-- else
-- as_dir="$ac_dir"
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
@@ -32446,7 +32139,11 @@
+ s//\1/
+ q
+ }
-+ s/.*/./; q'`
+ s/.*/./; q'`
+- { if $as_mkdir_p; then
+- mkdir -p "$ac_dir"
+- else
+- as_dir="$ac_dir"
+ { as_dir="$ac_dir"
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
@@ -32474,7 +32171,6 @@
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
@@ -32491,7 +32187,7 @@
+ s//\1/
+ q
+ }
-+ s/.*/./; q'`
+ s/.*/./; q'`
+ test -d "$as_dir" && break
done
- test ! -n "$as_dirs" || mkdir $as_dirs
@@ -32650,8 +32346,6 @@
-echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
- fi;;
-- esac
-- done` || { (exit 1); exit 1; }
+case `sed -n '/datarootdir/ {
+ p
+ q
@@ -32666,8 +32360,8 @@
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF
+ ac_datarootdir_hack='
+ s&@datadir@&$datadir&g
+ s&@docdir@&$docdir&g
@@ -32675,16 +32369,17 @@
+ s&@localedir@&$localedir&g
+ s&@mandir@&$mandir&g
+ s&\\\${datarootdir}&$datarootdir&g' ;;
-+esac
-+_ACEOF
+ esac
+- done` || { (exit 1); exit 1; }
+ _ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
-+cat >>$CONFIG_STATUS <<_ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
$extrasub
- _ACEOF
+@@ -15039,248 +15790,130 @@
cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -32706,14 +32401,6 @@
- cat $tmp/out
- rm -f $tmp/out
- fi
--
--done
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
--
--#
--# CONFIG_HEADER section.
--#
+s&@configure_input@&$configure_input&;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@srcdir@&$ac_srcdir&;t t
@@ -32727,19 +32414,9 @@
+$ac_datarootdir_hack
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
--# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
--# NAME is the cpp macro being defined and VALUE is the value it is being given.
--#
--# ac_d sets the value in "#define NAME VALUE" lines.
--ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
--ac_dB='[ ].*$,\1#\2'
--ac_dC=' '
--ac_dD=',;t'
--# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
--ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
--ac_uB='$,\1#\2define\3'
--ac_uC=' '
--ac_uD=',;t'
+-done
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
@@ -32748,10 +32425,53 @@
+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined." >&2;}
++ rm -f "$tmp/stdin"
++ case $ac_file in
++ -) cat "$tmp/out"; rm -f "$tmp/out";;
++ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
++ esac
++ ;;
++ :H)
+ #
+-# CONFIG_HEADER section.
++ # CONFIG_HEADER
+ #
++_ACEOF
+
+-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
+-# NAME is the cpp macro being defined and VALUE is the value it is being given.
+-#
+-# ac_d sets the value in "#define NAME VALUE" lines.
+-ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
+-ac_dB='[ ].*$,\1#\2'
++# Transform confdefs.h into a sed script `conftest.defines', that
++# substitutes the proper values into config.h.in to produce config.h.
++rm -f conftest.defines conftest.tail
++# First, append a space to every undef/define line, to ease matching.
++echo 's/$/ /' >conftest.defines
++# Then, protect against being on the right side of a sed subst, or in
++# an unquoted here document, in config.status. If some macros were
++# called several times there might be several #defines for the same
++# symbol, which is useless. But do not sort them, since the last
++# AC_DEFINE must be honored.
++ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
++# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
++# NAME is the cpp macro being defined, VALUE is the value it is being given.
++# PARAMS is the parameter list in the macro definition--in most cases, it's
++# just an empty string.
++ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
++ac_dB='\\)[ (].*,\\1define\\2'
+ ac_dC=' '
+-ac_dD=',;t'
+-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
+-ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
+-ac_uB='$,\1#\2define\3'
+-ac_uC=' '
+-ac_uD=',;t'
+-
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-+ rm -f "$tmp/stdin"
- case $ac_file in
+- case $ac_file in
- - | *:- | *:-:* ) # input from stdin
- cat >$tmp/stdin
- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
@@ -32759,9 +32479,7 @@
- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- * ) ac_file_in=$ac_file.in ;;
-+ -) cat "$tmp/out"; rm -f "$tmp/out";;
-+ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
- esac
+- esac
-
- test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
@@ -32797,12 +32515,8 @@
- # Remove the trailing spaces.
- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
-
-+ ;;
-+ :H)
-+ #
-+ # CONFIG_HEADER
-+ #
- _ACEOF
+-_ACEOF
++ac_dD=' ,'
-# Transform confdefs.h into two sed scripts, `conftest.defines' and
-# `conftest.undefs', that substitutes the proper values into
@@ -32819,7 +32533,15 @@
-# 0-ary CPP macros) applies to n-ary macro definitions.
-# See the Autoconf documentation for `clear'.
-cat >confdef2sed.sed <<\_ACEOF
--s/[\\&,]/\\&/g
++uniq confdefs.h |
++ sed -n '
++ t rset
++ :rset
++ s/^[ ]*#[ ]*define[ ][ ]*//
++ t ok
++ d
++ :ok
+ s/[\\&,]/\\&/g
-s,[\\$`],\\&,g
-t clear
-: clear
@@ -32834,40 +32556,11 @@
-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
-rm -f confdef2sed.sed
-+# Transform confdefs.h into a sed script `conftest.defines', that
-+# substitutes the proper values into config.h.in to produce config.h.
-+rm -f conftest.defines conftest.tail
-+# First, append a space to every undef/define line, to ease matching.
-+echo 's/$/ /' >conftest.defines
-+# Then, protect against being on the right side of a sed subst, or in
-+# an unquoted here document, in config.status. If some macros were
-+# called several times there might be several #defines for the same
-+# symbol, which is useless. But do not sort them, since the last
-+# AC_DEFINE must be honored.
-+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-+# NAME is the cpp macro being defined, VALUE is the value it is being given.
-+# PARAMS is the parameter list in the macro definition--in most cases, it's
-+# just an empty string.
-+ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
-+ac_dB='\\)[ (].*,\\1define\\2'
-+ac_dC=' '
-+ac_dD=' ,'
-
--# This sed command replaces #undef with comments. This is necessary, for
-+uniq confdefs.h |
-+ sed -n '
-+ t rset
-+ :rset
-+ s/^[ ]*#[ ]*define[ ][ ]*//
-+ t ok
-+ d
-+ :ok
-+ s/[\\&,]/\\&/g
+ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
+ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
+ ' >>conftest.defines
-+
+
+-# This sed command replaces #undef with comments. This is necessary, for
+# Remove the space that was appended to ease matching.
+# Then replace #undef with comments. This is necessary, for
# example, in the case of _POSIX_SOURCE, which is predefined and required
@@ -33032,7 +32725,7 @@
# Compute $ac_file's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
-@@ -15291,135 +15824,39 @@
+@@ -15291,135 +15924,39 @@
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
@@ -33049,7 +32742,23 @@
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`/stamp-h$_am_stamp_count
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
+ s/.*/./; q'`/stamp-h$_am_stamp_count
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
@@ -33122,23 +32831,6 @@
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
-# Do not use `cd foo && pwd` to compute absolute paths, because
@@ -33178,11 +32870,10 @@
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
- esac;;
--esac
+ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
+echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
-+ esac
+ esac
- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
@@ -33194,7 +32885,7 @@
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
-@@ -15429,18 +15866,29 @@
+@@ -15429,17 +15966,28 @@
# each Makefile.in and add a new line on top of each file to say so.
# So let's grep whole file.
if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
@@ -33211,7 +32902,6 @@
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
@@ -33228,11 +32918,10 @@
+ s//\1/
+ q
+ }
-+ s/.*/./; q'`
+ s/.*/./; q'`
else
continue
- fi
-@@ -15468,53 +15916,79 @@
+@@ -15468,53 +16016,79 @@
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
@@ -33249,11 +32938,6 @@
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-- { if $as_mkdir_p; then
-- mkdir -p $dirpart/$fdir
-- else
-- as_dir=$dirpart/$fdir
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
@@ -33270,7 +32954,11 @@
+ s//\1/
+ q
+ }
-+ s/.*/./; q'`
+ s/.*/./; q'`
+- { if $as_mkdir_p; then
+- mkdir -p $dirpart/$fdir
+- else
+- as_dir=$dirpart/$fdir
+ { as_dir=$dirpart/$fdir
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
@@ -33298,7 +32986,6 @@
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
@@ -33315,7 +33002,7 @@
+ s//\1/
+ q
+ }
-+ s/.*/./; q'`
+ s/.*/./; q'`
+ test -d "$as_dir" && break
done
- test ! -n "$as_dirs" || mkdir $as_dirs
@@ -33341,7 +33028,7 @@
{ (exit 0); exit 0; }
_ACEOF
-@@ -15551,7 +16025,10 @@
+@@ -15551,7 +16125,10 @@
# Remove --cache-file and --srcdir arguments so they do not pile up.
ac_sub_configure_args=
ac_prev=
@@ -33353,7 +33040,7 @@
if test -n "$ac_prev"; then
ac_prev=
continue
-@@ -15574,123 +16051,123 @@
+@@ -15574,123 +16151,123 @@
ac_prev=prefix ;;
-prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
;;
@@ -33424,7 +33111,6 @@
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
@@ -33441,7 +33127,7 @@
+ s//\1/
+ q
+ }
-+ s/.*/./; q'`
+ s/.*/./; q'`
+ test -d "$as_dir" && break
done
- test ! -n "$as_dirs" || mkdir $as_dirs
@@ -33563,7 +33249,7 @@
else
{ echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
-@@ -15702,21 +16179,21 @@
+@@ -15702,21 +16279,21 @@
# Make the cache file name correct relative to the subdirectory.
case $cache_file in
[\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
@@ -33592,9 +33278,9 @@
done
fi
-diff -urNad lustre-1.6.2~/ldiskfs/aclocal.m4 lustre-1.6.2/ldiskfs/aclocal.m4
---- lustre-1.6.2~/ldiskfs/aclocal.m4 2007-08-30 00:30:04.000000000 +0200
-+++ lustre-1.6.2/ldiskfs/aclocal.m4 2007-09-06 14:19:13.079814620 +0200
+diff -Nurwd orig/lustre-1.6.2/ldiskfs/aclocal.m4 lustre-1.6.2/ldiskfs/aclocal.m4
+--- orig/lustre-1.6.2/ldiskfs/aclocal.m4 2007-08-30 00:30:04.000000000 +0200
++++ lustre-1.6.2/ldiskfs/aclocal.m4 2007-09-14 13:58:37.000000000 +0200
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.7.8 -*- Autoconf -*-
+# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
@@ -33609,43 +33295,6 @@
+ [AM_AUTOMAKE_VERSION([1.7.9])])
# Helper functions for option handling. -*- Autoconf -*-
-
-@@ -1304,21 +1304,21 @@
- fi
-
- # FIXME
--AC_CHECK_DECL([__i386__], [], [
--
--if test x$enable_bgl != xyes; then
--AC_MSG_CHECKING([if $CC accepts -m64])
--CC_save="$CC"
--CC="$CC -m64"
--AC_TRY_COMPILE([],[],[
-- AC_MSG_RESULT([yes])
--],[
-- AC_MSG_RESULT([no])
-- CC="$CC_save"
--])
--fi
--
--])
-+#AC_CHECK_DECL([__i386__], [], [
-+#
-+#if test x$enable_bgl != xyes; then
-+#AC_MSG_CHECKING([if $CC accepts -m64])
-+#CC_save="$CC"
-+#CC="$CC -m64"
-+#AC_TRY_COMPILE([],[],[
-+# AC_MSG_RESULT([yes])
-+#],[
-+# AC_MSG_RESULT([no])
-+# CC="$CC_save"
-+#])
-+#fi
-+#
-+#])
-
- CPPFLAGS="-I\$(top_builddir)/lnet/include -I\$(top_srcdir)/lnet/include -I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS"
@@ -1454,6 +1454,1481 @@
_ACEOF
@@ -35255,24 +34904,31 @@
+ set_cpus_allowed(&t, m);
+ ],[
+ AC_DEFINE(CPU_AFFINITY, 1, [kernel has cpu affinity support])
-+ AC_MSG_RESULT([yes])
-+ ],[
+ AC_MSG_RESULT([yes])
+- AC_DEFINE_UNQUOTED([AS_TR_CPP([HAVE_$ac_func])]) $2
+ ],[
+- AC_MSG_RESULT([no]) $3
+-])dnl
+-done
+ AC_MSG_RESULT([no (no kernel support)])
+ ])
+fi
-+])
-+
-+#
+ ])
+
+ #
+-# LB_DARWIN_CONDITIONALS
+# LN_CONFIG_PORTALS
-+#
+ #
+-# AM_CONDITIONALs for darwin
+# configure support for Portals
-+#
+ #
+-AC_DEFUN([LB_DARWIN_CONDITIONALS],
+AC_DEFUN([LN_CONFIG_PORTALS],
+[AC_MSG_CHECKING([for portals])
+AC_ARG_WITH([portals],
+ AC_HELP_STRING([--with-portals=path],
+ [set path to portals]),
-+ [
+ [
+ case $with_portals in
+ no) ENABLEPORTALS=0
+ ;;
@@ -35295,13 +34951,17 @@
+ PTLLNDCPPFLAGS="-I${PORTALS}/include"
+fi
+AC_SUBST(PTLLNDCPPFLAGS)
-+])
-+
-+#
+ ])
+
+ #
+-# LB_PROG_DARWIN
+# LN_CONFIG_BACKOFF
-+#
+ #
+-# darwin tests
+# check if tunable tcp backoff is available/wanted
-+#
+ #
+-AC_DEFUN([LB_PROG_DARWIN],
+-[kernel_framework="/System/Library/Frameworks/Kernel.framework"
+AC_DEFUN([LN_CONFIG_BACKOFF],
+[AC_MSG_CHECKING([for tunable backoff TCP support])
+AC_ARG_ENABLE([backoff],
@@ -35321,9 +34981,14 @@
+fi
+])
+
-+#
+ #
+-# FIXME: there should be a better way to get these than hard coding them
+# LN_CONFIG_PANIC_DUMPLOG
-+#
+ #
+-case $target_cpu in
+- powerpc*)
+- EXTRA_KCFLAGS="$EXTRA_KCFLAGS -arch ppc -mtune=G4 -mlong-branch"
+- EXTRA_KLDFLAGS="-arch ppc"
+# check if tunable panic_dumplog is wanted
+#
+AC_DEFUN([LN_CONFIG_PANIC_DUMPLOG],
@@ -35355,8 +35020,7 @@
+
+PTLLND=""
+if test $ENABLEPORTALS -ne 0; then
- AC_MSG_RESULT([yes])
-- AC_DEFINE_UNQUOTED([AS_TR_CPP([HAVE_$ac_func])]) $2
++ AC_MSG_RESULT([yes])
+ PTLLND="ptllnd"
+else
+ AC_MSG_RESULT([no])
@@ -35472,11 +35136,14 @@
+ [
+ case $with_gm in
+ no) ENABLE_GM=0
-+ ;;
+ ;;
+- i?86 | x86_64)
+- EXTRA_KCFLAGS="$EXTRA_KCFLAGS -arch i386"
+- EXTRA_KLDFLAGS="-arch i386"
+ *) ENABLE_GM=1
+ GM_SRC="$with_gm"
-+ ;;
-+ esac
+ ;;
+ esac
+ ],[
+ ENABLE_GM=0
+ ])
@@ -35559,10 +35226,31 @@
+AC_SUBST(GMLND)
+])
+
-+
-+#
+
+-# Kernel of OS X is not 64bits(even in Tiger), but -m64 can be taken by gcc in Tiger
+-# (Tiger can support 64bits applications), so we have to eliminate -m64 while
+-# building kextensions for and OS X.
+-CC=`echo $CC | sed -e "s/\-m64//g"`
+-EXTRA_KCFLAGS="$EXTRA_KCFLAGS -x c -pipe -Wno-trigraphs -fasm-blocks -g -O0"
+-EXTRA_KCFLAGS="$EXTRA_KCFLAGS -Wno-four-char-constants -Wmost -O0"
+-EXTRA_KCFLAGS="$EXTRA_KCFLAGS -fmessage-length=0"
+-EXTRA_KCFLAGS="$EXTRA_KCFLAGS -I$kernel_framework/Headers"
+-EXTRA_KCFLAGS="$EXTRA_KCFLAGS -I$kernel_framework/Headers/bsd"
+-EXTRA_KCFLAGS="$EXTRA_KCFLAGS -I$kernel_framework/PrivateHeaders"
+-EXTRA_KCFLAGS="$EXTRA_KCFLAGS -fno-common -nostdinc -fno-builtin"
+-EXTRA_KCFLAGS="$EXTRA_KCFLAGS -finline -fno-keep-inline-functions"
+-EXTRA_KCFLAGS="$EXTRA_KCFLAGS -force_cpusubtype_ALL -fno-exceptions"
+-EXTRA_KCFLAGS="$EXTRA_KCFLAGS -msoft-float -static"
+-EXTRA_KCFLAGS="$EXTRA_KCFLAGS -DKERNEL -DKERNEL_PRIVATE"
+-EXTRA_KCFLAGS="$EXTRA_KCFLAGS -DDRIVER_PRIVATE -DAPPLE -DNeXT"
+-EXTRA_KCFLAGS="$EXTRA_KCFLAGS -D__KERNEL__ -D__DARWIN__"
+ #
+-# C flags for Panther/Tiger
+# LN_CONFIG_MX
-+#
+ #
+-case $target_os in
+- darwin8*)
+- EXTRA_KCFLAGS="$EXTRA_KCFLAGS -D__DARWIN8__"
+AC_DEFUN([LN_CONFIG_MX],
+[AC_MSG_CHECKING([whether to enable Myrinet MX support])
+# set default
@@ -35573,13 +35261,15 @@
+ [
+ case $with_mx in
+ yes) ENABLEMX=2
-+ ;;
+ ;;
+- darwin7*)
+- EXTRA_KCFLAGS="$EXTRA_KCFLAGS -ffix-and-continue"
+ no) ENABLEMX=0
+ ;;
+ *) MXPATH=$with_mx
+ ENABLEMX=3
-+ ;;
-+ esac
+ ;;
+ esac
+ ],[
+ ENABLEMX=1
+ ])
@@ -35638,10 +35328,15 @@
+])
+
+
-+
-+#
+
+ #
+-# Debugging flags. Remove!
+# LN_CONFIG_O2IB
-+#
+ #
+-EXTRA_KCFLAGS="$EXTRA_KCFLAGS -O0 -DMACH_ASSERT=1"
+-EXTRA_KLDFLAGS="$EXTRA_KLDFLAGS -static -nostdlib -r"
+-EXTRA_KLIBS="-lkmodc++ -lkmod -lcc_kext"
+-KMODEXT=""
+AC_DEFUN([LN_CONFIG_O2IB],[
+AC_MSG_CHECKING([whether to enable OpenIB gen2 support])
+# set default
@@ -35696,7 +35391,9 @@
+ struct ib_qp_attr qp_attr;
+ struct ib_pool_fmr pool_fmr;
+ enum ib_cm_rej_reason rej_reason;
-+
+
+-AC_SUBST(EXTRA_KLDFLAGS)
+-AC_SUBST(EXTRA_KLIBS)
+ cm_id = rdma_create_id(NULL, NULL, RDMA_PS_TCP);
+ return PTR_ERR(cm_id);
+ ],[
@@ -35713,25 +35410,34 @@
+ O2IBLND=""
+ O2IBCPPFLAGS=""
+ ])
-+
+
+-kextdir='/System/Library/Extensions/$(firstword $(macos_PROGRAMS)).kext'
+-plistdir='$(kextdir)/Contents'
+-macosdir='$(plistdir)/MacOS'
+ IB_DMA_MAP="`grep -c ib_dma_map_single ${O2IBPATH}/include/rdma/ib_verbs.h`"
+ if test "$IB_DMA_MAP" != 0 ; then
+ IBLND_OFED_VERSION="102"
+ else
+ IBLND_OFED_VERSION="101"
+ fi
-+
+
+-AC_SUBST(kextdir)
+-AC_SUBST(plistdir)
+-AC_SUBST(macosdir)
+ AC_DEFINE_UNQUOTED(IBLND_OFED_VERSION, $IBLND_OFED_VERSION,
+ [OFED version])
-+
+
+-LN_PROG_DARWIN
+ EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save"
+fi
-+
+
+-LP_PROG_DARWIN
+AC_SUBST(EXTRA_LNET_INCLUDE)
+AC_SUBST(O2IBCPPFLAGS)
+AC_SUBST(O2IBLND)
+])
-+
+
+-LC_PROG_DARWIN
+#
+# LN_CONFIG_OPENIB
+#
@@ -36054,10 +35760,7 @@
+LB_LINUX_TRY_COMPILE([
+ #include <linux/types.h>
+ #include <rapl.h>
- ],[
-- AC_MSG_RESULT([no]) $3
--])dnl
--done
++],[
+ RAP_RETURN rc;
+ RAP_PVOID dev_handle;
+
@@ -36075,16 +35778,13 @@
+EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save"
+AC_SUBST(RACPPFLAGS)
+AC_SUBST(RALND)
- ])
-
- #
--# LB_DARWIN_CONDITIONALS
++])
++
++#
+# LN_STRUCT_PAGE_LIST
- #
--# AM_CONDITIONALs for darwin
++#
+# 2.6.4 no longer has page->list
- #
--AC_DEFUN([LB_DARWIN_CONDITIONALS],
++#
+AC_DEFUN([LN_STRUCT_PAGE_LIST],
+[AC_MSG_CHECKING([if struct page has a list field])
+LB_LINUX_TRY_COMPILE([
@@ -36351,18 +36051,14 @@
+# default paths for installed files
+#
+AC_DEFUN([LN_PATH_DEFAULTS],
- [
- ])
-
- #
--# LB_PROG_DARWIN
++[
++])
++
++#
+# LN_CONFIGURE
- #
--# darwin tests
++#
+# other configure checks
- #
--AC_DEFUN([LB_PROG_DARWIN],
--[kernel_framework="/System/Library/Frameworks/Kernel.framework"
++#
+AC_DEFUN([LN_CONFIGURE],
+[# lnet/utils/portals.c
+AC_CHECK_HEADERS([netdb.h netinet/tcp.h asm/types.h endian.h sys/ioctl.h])
@@ -36381,20 +36077,9 @@
+
+# -------- Check for required packages --------------
+
- #
--# FIXME: there should be a better way to get these than hard coding them
++#
+# LC_CONFIG_READLINE
- #
--case $target_cpu in
-- powerpc*)
-- EXTRA_KCFLAGS="$EXTRA_KCFLAGS -arch ppc -mtune=G4 -mlong-branch"
-- EXTRA_KLDFLAGS="-arch ppc"
-- ;;
-- i?86 | x86_64)
-- EXTRA_KCFLAGS="$EXTRA_KCFLAGS -arch i386"
-- EXTRA_KLDFLAGS="-arch i386"
-- ;;
--esac
++#
+# Build with readline
+#
+AC_MSG_CHECKING([whether to enable readline support])
@@ -36518,35 +36203,10 @@
+LN_CONFIG_UPTLLND
+LN_CONFIG_USOCKLND
+])
-
--# Kernel of OS X is not 64bits(even in Tiger), but -m64 can be taken by gcc in Tiger
--# (Tiger can support 64bits applications), so we have to eliminate -m64 while
--# building kextensions for and OS X.
--CC=`echo $CC | sed -e "s/\-m64//g"`
--EXTRA_KCFLAGS="$EXTRA_KCFLAGS -x c -pipe -Wno-trigraphs -fasm-blocks -g -O0"
--EXTRA_KCFLAGS="$EXTRA_KCFLAGS -Wno-four-char-constants -Wmost -O0"
--EXTRA_KCFLAGS="$EXTRA_KCFLAGS -fmessage-length=0"
--EXTRA_KCFLAGS="$EXTRA_KCFLAGS -I$kernel_framework/Headers"
--EXTRA_KCFLAGS="$EXTRA_KCFLAGS -I$kernel_framework/Headers/bsd"
--EXTRA_KCFLAGS="$EXTRA_KCFLAGS -I$kernel_framework/PrivateHeaders"
--EXTRA_KCFLAGS="$EXTRA_KCFLAGS -fno-common -nostdinc -fno-builtin"
--EXTRA_KCFLAGS="$EXTRA_KCFLAGS -finline -fno-keep-inline-functions"
--EXTRA_KCFLAGS="$EXTRA_KCFLAGS -force_cpusubtype_ALL -fno-exceptions"
--EXTRA_KCFLAGS="$EXTRA_KCFLAGS -msoft-float -static"
--EXTRA_KCFLAGS="$EXTRA_KCFLAGS -DKERNEL -DKERNEL_PRIVATE"
--EXTRA_KCFLAGS="$EXTRA_KCFLAGS -DDRIVER_PRIVATE -DAPPLE -DNeXT"
--EXTRA_KCFLAGS="$EXTRA_KCFLAGS -D__KERNEL__ -D__DARWIN__"
- #
--# C flags for Panther/Tiger
++
++#
+# LN_CONDITIONALS
- #
--case $target_os in
-- darwin8*)
-- EXTRA_KCFLAGS="$EXTRA_KCFLAGS -D__DARWIN8__"
-- ;;
-- darwin7*)
-- EXTRA_KCFLAGS="$EXTRA_KCFLAGS -ffix-and-continue"
-- ;;
++#
+# AM_CONDITOINAL defines for lnet
+#
+AC_DEFUN([LN_CONDITIONALS],
@@ -36626,17 +36286,12 @@
+lnet/libcfs/darwin/Makefile
+])
+ ;;
- esac
++esac
+])
-
- #
--# Debugging flags. Remove!
++
++#
+# LS_CONFIGURE
- #
--EXTRA_KCFLAGS="$EXTRA_KCFLAGS -O0 -DMACH_ASSERT=1"
--EXTRA_KLDFLAGS="$EXTRA_KLDFLAGS -static -nostdlib -r"
--EXTRA_KLIBS="-lkmodc++ -lkmod -lcc_kext"
--KMODEXT=""
++#
+# configure bits for lustre-snmp
+#
+AC_DEFUN([LS_CONFIGURE],
@@ -36646,28 +36301,19 @@
+ [require SNMP support (default=auto)]),
+ [],[enable_snmp='auto'])
+AC_MSG_RESULT([$enable_snmp])
-
--AC_SUBST(EXTRA_KLDFLAGS)
--AC_SUBST(EXTRA_KLIBS)
++
+if test x$enable_snmp != xno ; then
+ AC_CHECK_PROG([NET_SNMP_CONFIG], [net-snmp-config], [net-snmp-config])
+ if test "$NET_SNMP_CONFIG" ; then
+ NET_SNMP_CFLAGS=$($NET_SNMP_CONFIG --base-cflags)
+ NET_SNMP_LIBS=$($NET_SNMP_CONFIG --agent-libs)
-
--kextdir='/System/Library/Extensions/$(firstword $(macos_PROGRAMS)).kext'
--plistdir='$(kextdir)/Contents'
--macosdir='$(plistdir)/MacOS'
++
+ CPPFLAGS_save="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $NET_SNMP_CFLAGS"
-
--AC_SUBST(kextdir)
--AC_SUBST(plistdir)
--AC_SUBST(macosdir)
++
+ LIBS_save="$LIBS"
+ LIBS="$LIBS $NET_SNMP_LIBS"
-
--LN_PROG_DARWIN
++
+ AC_CHECK_HEADER([net-snmp/net-snmp-config.h],[
+ AC_CHECK_FUNC([register_mib],[SNMP_SUBDIR="snmp"],[
+ LIBS="$LIBS -lwrap"
@@ -36677,8 +36323,7 @@
+ AC_CHECK_FUNC([register_mib],[SNMP_SUBDIR="snmp"])
+ ])
+ ])
-
--LP_PROG_DARWIN
++
+ LIBS="$LIBS_save"
+ CPPFLAGS="$CPPFLAGS_save"
+ fi
@@ -36692,8 +36337,7 @@
+ fi
+ fi
+fi
-
--LC_PROG_DARWIN
++
+agentdir='${pkglibdir}/snmp'
+mibdir='${pkgdatadir}/snmp/mibs'
+
@@ -36715,91 +36359,10 @@
+])
])
-diff -urNad lustre-1.6.2~/ldiskfs/autoMakefile.in lustre-1.6.2/ldiskfs/autoMakefile.in
---- lustre-1.6.2~/ldiskfs/autoMakefile.in 2007-08-30 00:30:06.000000000 +0200
-+++ lustre-1.6.2/ldiskfs/autoMakefile.in 2007-09-06 14:19:14.792553331 +0200
-@@ -1,4 +1,4 @@
--# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
-+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
- # @configure_input@
-
- # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-@@ -66,6 +66,7 @@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- EXTRA_KCFLAGS = @EXTRA_KCFLAGS@
-+GREP = @GREP@
- INCLUDE_RULES = @INCLUDE_RULES@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -116,8 +117,6 @@
- VERSION = @VERSION@
- ac_configure_args = @ac_configure_args@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__include = @am__include@
-@@ -130,12 +129,16 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-@@ -143,14 +146,17 @@
- libdir = @libdir@
- libexecdir = @libexecdir@
- linux25 = @linux25@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- moduledir = @moduledir@
- modulefsdir = @modulefsdir@
- modulenetdir = @modulenetdir@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-@@ -197,8 +203,8 @@
- DIST_COMMON = $(srcdir)/autoMakefile.in \
- $(srcdir)/build/autoMakefile.am.toplevel $(srcdir)/configure \
- COPYING ChangeLog Makefile.in aclocal.m4 autoMakefile.am \
-- config.guess config.h.in config.sub configure.ac install-sh \
-- lustre-ldiskfs.spec.in missing mkinstalldirs
-+ config.guess config.h.in config.sub configure configure.ac \
-+ install-sh lustre-ldiskfs.spec.in missing mkinstalldirs
- all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-@@ -486,7 +492,7 @@
- installcheck: installcheck-recursive
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-- INSTALL_STRIP_FLAG=-s \
-+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-diff -urNad lustre-1.6.2~/ldiskfs/autom4te.cache/output.0 lustre-1.6.2/ldiskfs/autom4te.cache/output.0
---- lustre-1.6.2~/ldiskfs/autom4te.cache/output.0 1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.6.2/ldiskfs/autom4te.cache/output.0 2007-09-06 14:19:13.962679933 +0200
-@@ -0,0 +1,7281 @@
+diff -Nurwd orig/lustre-1.6.2/ldiskfs/autom4te.cache/output.0 lustre-1.6.2/ldiskfs/autom4te.cache/output.0
+--- orig/lustre-1.6.2/ldiskfs/autom4te.cache/output.0 1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.6.2/ldiskfs/autom4te.cache/output.0 2007-09-14 13:58:38.000000000 +0200
+@@ -0,0 +1,7382 @@
+@%:@! /bin/sh
+@%:@ Guess values for system-dependent variables and create Makefiles.
+@%:@ Generated by GNU Autoconf 2.61 for Lustre ldiskfs 3.0.0.
@@ -41431,21 +40994,121 @@
+fi
+
+# FIXME
-+#AC_CHECK_DECL([__i386__], [], [
-+#
-+#if test x$enable_bgl != xyes; then
-+#AC_MSG_CHECKING([if $CC accepts -m64])
-+#CC_save="$CC"
-+#CC="$CC -m64"
-+#AC_TRY_COMPILE([],[],[
-+# AC_MSG_RESULT([yes])
-+#],[
-+# AC_MSG_RESULT([no])
-+# CC="$CC_save"
-+#])
-+#fi
-+#
-+#])
++{ echo "$as_me:$LINENO: checking whether __i386__ is declared" >&5
++echo $ECHO_N "checking whether __i386__ is declared... $ECHO_C" >&6; }
++if test "${ac_cv_have_decl___i386__+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++int
++main ()
++{
++#ifndef __i386__
++ (void) __i386__;
++#endif
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_have_decl___i386__=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_cv_have_decl___i386__=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_have_decl___i386__" >&5
++echo "${ECHO_T}$ac_cv_have_decl___i386__" >&6; }
++if test $ac_cv_have_decl___i386__ = yes; then
++ :
++else
++
++
++if test x$enable_bgl != xyes; then
++{ echo "$as_me:$LINENO: checking if $CC accepts -m64" >&5
++echo $ECHO_N "checking if $CC accepts -m64... $ECHO_C" >&6; }
++CC_save="$CC"
++CC="$CC -m64"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++ CC="$CC_save"
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++
++fi
++
+
+CPPFLAGS="-I\$(top_builddir)/lnet/include -I\$(top_srcdir)/lnet/include -I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS"
+
@@ -42610,12 +42273,13 @@
+2.6.18-*prep*) LDISKFS_SERIES="2.6-rhel5.series";;
+2.6.18*) if test -e $LINUX_OBJ/version.Debian; then
+ LDISKFS_SERIES="2.6.18-debian.series"
-+ else
++ else
+ LDISKFS_SERIES="2.6.18-vanilla.series"
-+ fi;;
++ fi;;
+2.6.20*) LDISKFS_SERIES="2.6.20-vanilla.series";;
+2.6.21*) LDISKFS_SERIES="2.6.21-vanilla.series";;
+2.6.22*) LDISKFS_SERIES="2.6.22-vanilla.series";;
++2.6.23*) LDISKFS_SERIES="2.6.23-vanilla.series";;
+*) { echo "$as_me:$LINENO: WARNING: Unknown kernel version $LINUXRELEASE, fix ldiskfs/configure.ac" >&5
+echo "$as_me: WARNING: Unknown kernel version $LINUXRELEASE, fix ldiskfs/configure.ac" >&2;}
+esac
@@ -44081,9 +43745,9 @@
+ $ac_cs_success || { (exit 1); exit 1; }
+fi
+
-diff -urNad lustre-1.6.2~/ldiskfs/autom4te.cache/requests lustre-1.6.2/ldiskfs/autom4te.cache/requests
---- lustre-1.6.2~/ldiskfs/autom4te.cache/requests 1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.6.2/ldiskfs/autom4te.cache/requests 2007-09-06 14:19:15.351468065 +0200
+diff -Nurwd orig/lustre-1.6.2/ldiskfs/autom4te.cache/requests lustre-1.6.2/ldiskfs/autom4te.cache/requests
+--- orig/lustre-1.6.2/ldiskfs/autom4te.cache/requests 1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.6.2/ldiskfs/autom4te.cache/requests 2007-09-14 13:58:40.000000000 +0200
@@ -0,0 +1,64 @@
+# This file was generated by Autom4te Wed Jan 17 19:57:31 PST 2007.
+# It contains the lists of macros which have been traced.
@@ -44102,15 +43766,15 @@
+ 'configure.ac'
+ ],
+ {
++ 'AM_PROG_F77_C_O' => 1,
+ '_LT_AC_TAGCONFIG' => 1,
-+ 'AM_PROG_F77_C_O' => 1,
++ 'm4_pattern_forbid' => 1,
+ 'AC_INIT' => 1,
-+ 'm4_pattern_forbid' => 1,
+ 'AC_CANONICAL_TARGET' => 1,
++ 'AC_CONFIG_LIBOBJ_DIR' => 1,
+ 'AC_SUBST' => 1,
-+ 'AC_CONFIG_LIBOBJ_DIR' => 1,
++ 'AC_CANONICAL_HOST' => 1,
+ 'AC_FC_SRCEXT' => 1,
-+ 'AC_CANONICAL_HOST' => 1,
+ 'AC_PROG_LIBTOOL' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
+ 'AC_CONFIG_SUBDIRS' => 1,
@@ -44118,8 +43782,8 @@
+ 'LT_CONFIG_LTDL_DIR' => 1,
+ 'AC_REQUIRE_AUX_FILE' => 1,
+ 'AC_CONFIG_LINKS' => 1,
++ 'LT_SUPPORTED_TAG' => 1,
+ 'm4_sinclude' => 1,
-+ 'LT_SUPPORTED_TAG' => 1,
+ 'AM_MAINTAINER_MODE' => 1,
+ 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+ '_m4_warn' => 1,
@@ -44136,11 +43800,11 @@
+ 'AH_OUTPUT' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
+ 'AC_CONFIG_AUX_DIR' => 1,
++ 'm4_pattern_allow' => 1,
++ 'AM_PROG_CC_C_O' => 1,
+ 'sinclude' => 1,
-+ 'AM_PROG_CC_C_O' => 1,
-+ 'm4_pattern_allow' => 1,
++ 'AM_CONDITIONAL' => 1,
+ 'AC_CANONICAL_SYSTEM' => 1,
-+ 'AM_CONDITIONAL' => 1,
+ 'AC_CONFIG_HEADERS' => 1,
+ 'AC_DEFINE_TRACE_LITERAL' => 1,
+ 'm4_include' => 1,
@@ -44149,10 +43813,10 @@
+ ], 'Autom4te::Request' )
+ );
+
-diff -urNad lustre-1.6.2~/ldiskfs/autom4te.cache/traces.0 lustre-1.6.2/ldiskfs/autom4te.cache/traces.0
---- lustre-1.6.2~/ldiskfs/autom4te.cache/traces.0 1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.6.2/ldiskfs/autom4te.cache/traces.0 2007-09-06 14:19:13.962679933 +0200
-@@ -0,0 +1,571 @@
+diff -Nurwd orig/lustre-1.6.2/ldiskfs/autom4te.cache/traces.0 lustre-1.6.2/ldiskfs/autom4te.cache/traces.0
+--- orig/lustre-1.6.2/ldiskfs/autom4te.cache/traces.0 1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.6.2/ldiskfs/autom4te.cache/traces.0 2007-09-14 13:58:38.000000000 +0200
+@@ -0,0 +1,577 @@
+m4trace:aclocal.m4:43: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
+m4trace:configure.ac:3: -1- AC_INIT([Lustre ldiskfs], [3.0.0], [https://bugzilla.lustre.org/])
+m4trace:configure.ac:3: -1- m4_pattern_forbid([^_?A[CHUM]_])
@@ -44534,6 +44198,12 @@
+m4trace:configure.ac:17: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_LONG_LONG$])
+m4trace:configure.ac:17: -1- AH_OUTPUT([SIZEOF_UNSIGNED_LONG_LONG], [/* The size of `unsigned long long\', as computed by sizeof. */
+#undef SIZEOF_UNSIGNED_LONG_LONG])
++m4trace:configure.ac:17: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from...
++../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from...
++../../lib/autoconf/general.m4:2530: AC_CHECK_DECL is expanded from...
++aclocal.m4:1266: LB_PROG_CC is expanded from...
++configure.ac:17: the top level])
+m4trace:configure.ac:17: -1- AC_SUBST([LLCPPFLAGS])
+m4trace:configure.ac:17: -1- AC_SUBST_TRACE([LLCPPFLAGS])
+m4trace:configure.ac:17: -1- m4_pattern_allow([^LLCPPFLAGS$])
@@ -44693,40 +44363,121 @@
+m4trace:configure.ac:64: -1- m4_pattern_allow([^CONFIG_LDISKFS_FS_SECURITY$])
+m4trace:configure.ac:64: -1- AH_OUTPUT([CONFIG_LDISKFS_FS_SECURITY], [/* enable fs security for ldiskfs */
+#undef CONFIG_LDISKFS_FS_SECURITY])
-+m4trace:configure.ac:88: -1- AC_SUBST([LDISKFS_SERIES])
-+m4trace:configure.ac:88: -1- AC_SUBST_TRACE([LDISKFS_SERIES])
-+m4trace:configure.ac:88: -1- m4_pattern_allow([^LDISKFS_SERIES$])
-+m4trace:configure.ac:90: -1- AC_SUBST([ac_configure_args])
-+m4trace:configure.ac:90: -1- AC_SUBST_TRACE([ac_configure_args])
-+m4trace:configure.ac:90: -1- m4_pattern_allow([^ac_configure_args$])
-+m4trace:configure.ac:92: -1- AC_CONFIG_FILES([Makefile
++m4trace:configure.ac:89: -1- AC_SUBST([LDISKFS_SERIES])
++m4trace:configure.ac:89: -1- AC_SUBST_TRACE([LDISKFS_SERIES])
++m4trace:configure.ac:89: -1- m4_pattern_allow([^LDISKFS_SERIES$])
++m4trace:configure.ac:91: -1- AC_SUBST([ac_configure_args])
++m4trace:configure.ac:91: -1- AC_SUBST_TRACE([ac_configure_args])
++m4trace:configure.ac:91: -1- m4_pattern_allow([^ac_configure_args$])
++m4trace:configure.ac:93: -1- AC_CONFIG_FILES([Makefile
+autoMakefile
+
+Rules:build/Rules.in
+lustre-ldiskfs.spec
+])
-+m4trace:configure.ac:93: -1- AC_CONFIG_FILES([ldiskfs/autoMakefile ldiskfs/Makefile])
-+m4trace:configure.ac:96: -1- AC_SUBST([MOSTLYCLEANFILES])
-+m4trace:configure.ac:96: -1- AC_SUBST_TRACE([MOSTLYCLEANFILES])
-+m4trace:configure.ac:96: -1- m4_pattern_allow([^MOSTLYCLEANFILES$])
-+m4trace:configure.ac:98: -1- AC_SUBST([LIB@&t at OBJS], [$ac_libobjs])
-+m4trace:configure.ac:98: -1- AC_SUBST_TRACE([LIB@&t at OBJS])
-+m4trace:configure.ac:98: -1- m4_pattern_allow([^LIB@&t at OBJS$])
-+m4trace:configure.ac:98: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-+m4trace:configure.ac:98: -1- AC_SUBST_TRACE([LTLIBOBJS])
-+m4trace:configure.ac:98: -1- m4_pattern_allow([^LTLIBOBJS$])
-+m4trace:configure.ac:98: -1- AC_SUBST_TRACE([top_builddir])
-+m4trace:configure.ac:98: -1- AC_SUBST_TRACE([srcdir])
-+m4trace:configure.ac:98: -1- AC_SUBST_TRACE([abs_srcdir])
-+m4trace:configure.ac:98: -1- AC_SUBST_TRACE([top_srcdir])
-+m4trace:configure.ac:98: -1- AC_SUBST_TRACE([abs_top_srcdir])
-+m4trace:configure.ac:98: -1- AC_SUBST_TRACE([builddir])
-+m4trace:configure.ac:98: -1- AC_SUBST_TRACE([abs_builddir])
-+m4trace:configure.ac:98: -1- AC_SUBST_TRACE([abs_top_builddir])
-+m4trace:configure.ac:98: -1- AC_SUBST_TRACE([INSTALL])
-diff -urNad lustre-1.6.2~/ldiskfs/config.h.in lustre-1.6.2/ldiskfs/config.h.in
---- lustre-1.6.2~/ldiskfs/config.h.in 2007-08-30 00:30:05.000000000 +0200
-+++ lustre-1.6.2/ldiskfs/config.h.in 2007-09-06 14:18:09.548506719 +0200
++m4trace:configure.ac:94: -1- AC_CONFIG_FILES([ldiskfs/autoMakefile ldiskfs/Makefile])
++m4trace:configure.ac:97: -1- AC_SUBST([MOSTLYCLEANFILES])
++m4trace:configure.ac:97: -1- AC_SUBST_TRACE([MOSTLYCLEANFILES])
++m4trace:configure.ac:97: -1- m4_pattern_allow([^MOSTLYCLEANFILES$])
++m4trace:configure.ac:99: -1- AC_SUBST([LIB@&t at OBJS], [$ac_libobjs])
++m4trace:configure.ac:99: -1- AC_SUBST_TRACE([LIB@&t at OBJS])
++m4trace:configure.ac:99: -1- m4_pattern_allow([^LIB@&t at OBJS$])
++m4trace:configure.ac:99: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
++m4trace:configure.ac:99: -1- AC_SUBST_TRACE([LTLIBOBJS])
++m4trace:configure.ac:99: -1- m4_pattern_allow([^LTLIBOBJS$])
++m4trace:configure.ac:99: -1- AC_SUBST_TRACE([top_builddir])
++m4trace:configure.ac:99: -1- AC_SUBST_TRACE([srcdir])
++m4trace:configure.ac:99: -1- AC_SUBST_TRACE([abs_srcdir])
++m4trace:configure.ac:99: -1- AC_SUBST_TRACE([top_srcdir])
++m4trace:configure.ac:99: -1- AC_SUBST_TRACE([abs_top_srcdir])
++m4trace:configure.ac:99: -1- AC_SUBST_TRACE([builddir])
++m4trace:configure.ac:99: -1- AC_SUBST_TRACE([abs_builddir])
++m4trace:configure.ac:99: -1- AC_SUBST_TRACE([abs_top_builddir])
++m4trace:configure.ac:99: -1- AC_SUBST_TRACE([INSTALL])
+diff -Nurwd orig/lustre-1.6.2/ldiskfs/autoMakefile.in lustre-1.6.2/ldiskfs/autoMakefile.in
+--- orig/lustre-1.6.2/ldiskfs/autoMakefile.in 2007-08-30 00:30:06.000000000 +0200
++++ lustre-1.6.2/ldiskfs/autoMakefile.in 2007-09-14 13:58:39.000000000 +0200
+@@ -1,4 +1,4 @@
+-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
++# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
+ # @configure_input@
+
+ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+@@ -66,6 +66,7 @@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ EXTRA_KCFLAGS = @EXTRA_KCFLAGS@
++GREP = @GREP@
+ INCLUDE_RULES = @INCLUDE_RULES@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -116,8 +117,6 @@
+ VERSION = @VERSION@
+ ac_configure_args = @ac_configure_args@
+ ac_ct_CC = @ac_ct_CC@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+ am__include = @am__include@
+@@ -130,12 +129,16 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+@@ -143,14 +146,17 @@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+ linux25 = @linux25@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ moduledir = @moduledir@
+ modulefsdir = @modulefsdir@
+ modulenetdir = @modulenetdir@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+@@ -197,8 +203,8 @@
+ DIST_COMMON = $(srcdir)/autoMakefile.in \
+ $(srcdir)/build/autoMakefile.am.toplevel $(srcdir)/configure \
+ COPYING ChangeLog Makefile.in aclocal.m4 autoMakefile.am \
+- config.guess config.h.in config.sub configure.ac install-sh \
+- lustre-ldiskfs.spec.in missing mkinstalldirs
++ config.guess config.h.in config.sub configure configure.ac \
++ install-sh lustre-ldiskfs.spec.in missing mkinstalldirs
+ all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+@@ -486,7 +492,7 @@
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- INSTALL_STRIP_FLAG=-s \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ mostlyclean-generic:
+diff -Nurwd orig/lustre-1.6.2/ldiskfs/config.h.in lustre-1.6.2/ldiskfs/config.h.in
+--- orig/lustre-1.6.2/ldiskfs/config.h.in 2007-08-30 00:30:05.000000000 +0200
++++ lustre-1.6.2/ldiskfs/config.h.in 2007-09-14 13:50:45.000000000 +0200
@@ -57,7 +57,7 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
@@ -44736,9 +44487,9 @@
#undef SIZEOF_UNSIGNED_LONG_LONG
/* Define to 1 if you have the ANSI C header files. */
-diff -urNad lustre-1.6.2~/ldiskfs/configure lustre-1.6.2/ldiskfs/configure
---- lustre-1.6.2~/ldiskfs/configure 2007-08-30 00:30:07.000000000 +0200
-+++ lustre-1.6.2/ldiskfs/configure 2007-09-06 14:19:15.351468065 +0200
+diff -Nurwd orig/lustre-1.6.2/ldiskfs/configure lustre-1.6.2/ldiskfs/configure
+--- orig/lustre-1.6.2/ldiskfs/configure 2007-08-30 00:30:07.000000000 +0200
++++ lustre-1.6.2/ldiskfs/configure 2007-09-14 13:58:40.000000000 +0200
@@ -1,27 +1,56 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -44885,7 +44636,6 @@
- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
- /^X\/\(\/\/\)$/{ s//\1/; q; }
- /^X\/\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
@@ -44898,7 +44648,7 @@
+ s//\1/
+ q
+ }
-+ s/.*/./; q'`
+ s/.*/./; q'`
+# CDPATH.
+$as_unset CDPATH
@@ -44918,17 +44668,15 @@
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
-- else
-- PATH_SEPARATOR=:
-- fi
-- rm -f conf$$.sh
+if test "x$CONFIG_SHELL" = x; then
+ if (eval ":") 2>/dev/null; then
+ as_have_required=yes
-+else
+ else
+- PATH_SEPARATOR=:
+ as_have_required=no
- fi
-
+ fi
+- rm -f conf$$.sh
++
+ if test $as_have_required = yes && (eval ":
+(as_func_return () {
+ (exit \$1)
@@ -44945,6 +44693,19 @@
+as_func_ret_failure () {
+ return 1
+}
++
++exitcode=0
++if as_func_success; then
++ :
++else
++ exitcode=1
++ echo as_func_success failed.
+ fi
+
++if as_func_failure; then
++ exitcode=1
++ echo as_func_failure succeeded.
++fi
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
@@ -44962,12 +44723,11 @@
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-+exitcode=0
-+if as_func_success; then
++if as_func_ret_success; then
+ :
+else
+ exitcode=1
-+ echo as_func_success failed.
++ echo as_func_ret_success failed.
+fi
- ;;
@@ -44976,36 +44736,22 @@
- # in which case we are not to be found in the path.
- if test "x$as_myself" = x; then
- as_myself=$0
-- fi
++if as_func_ret_failure; then
++ exitcode=1
++ echo as_func_ret_failure succeeded.
+ fi
- if test ! -f "$as_myself"; then
- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
- { (exit 1); exit 1; }; }
-- fi
++
++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
++ :
++else
++ exitcode=1
++ echo positional parameters were not saved.
+ fi
- case $CONFIG_SHELL in
- '')
-+if as_func_failure; then
-+ exitcode=1
-+ echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+ exitcode=1
-+ echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+ :
-+else
-+ exitcode=1
-+ echo positional parameters were not saved.
-+fi
+
+test \$exitcode = 0) || { (exit 1); exit 1; }
+
@@ -45024,8 +44770,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for as_base in sh bash ksh sh5; do
-- case $as_dir in
-+ case $as_dir in
+ case $as_dir in
/*)
- if ("$as_dir/$as_base" -c '
+ for as_base in sh bash ksh sh5; do
@@ -45140,10 +44885,6 @@
- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
- fi;;
- esac
-- done
--done
--;;
-- esac
+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+
+_ASEOF
@@ -45153,12 +44894,14 @@
+
+fi
+
-+ done
+ done
+
+ if test "x$CONFIG_SHELL" != x; then
+ for as_var in BASH_ENV ENV
+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+ done
+ done
+-;;
+- esac
+ export CONFIG_SHELL
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
@@ -45268,9 +45011,8 @@
+ :lineno
N
- s,$,-,
-- : loop
+ : loop
- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+ :loop
+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
t loop
- s,-$,,
@@ -45336,16 +45078,16 @@
- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
- if test -f conf$$.exe; then
- # Don't use ln at all; we don't have any links
-+ as_ln_s='ln -s'
+- as_ln_s='cp -p'
+- else
+ as_ln_s='ln -s'
+- fi
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
-- else
-- as_ln_s='ln -s'
-- fi
++ as_ln_s='cp -p'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
@@ -45470,12 +45212,11 @@
-#else
-# if HAVE_STDINT_H
-# include <stdint.h>
--# endif
+ # endif
++#ifdef HAVE_STDINT_H
++# include <stdint.h>
#endif
-#if HAVE_UNISTD_H
-+#ifdef HAVE_STDINT_H
-+# include <stdint.h>
-+#endif
+#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif"
@@ -45897,7 +45638,6 @@
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
@@ -45914,7 +45654,7 @@
+ s//\1/
+ q
+ }
-+ s/.*/./; q'`
+ s/.*/./; q'`
srcdir=$ac_confdir
- if test ! -r $srcdir/$ac_unique_file; then
+ if test ! -r "$srcdir/$ac_unique_file"; then
@@ -45928,13 +45668,12 @@
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
- { (exit 1); exit 1; }; }
- else
-- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+if test ! -r "$srcdir/$ac_unique_file"; then
+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
{ (exit 1); exit 1; }; }
-- fi
- fi
+ fi
+-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
@@ -46345,7 +46084,7 @@
done | sort
echo
fi
-@@ -1162,26 +1623,24 @@
+@@ -1162,15 +1623,15 @@
## ----------- ##
_ASBOX
echo
@@ -46362,11 +46101,9 @@
+ rm -f core *.core core.conftest.* &&
+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
exit $exit_status
-- ' 0
-+' 0
+ ' 0
for ac_signal in 1 2 13 15; do
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
- done
+@@ -1179,9 +1640,7 @@
ac_signal=0
# confdefs.h avoids OS command line length limits that DEFS can exceed.
@@ -46384,14 +46121,13 @@
-if test -z "$CONFIG_SITE"; then
- if test "x$prefix" != xNONE; then
- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-- else
-- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-- fi
+if test -n "$CONFIG_SITE"; then
+ set x "$CONFIG_SITE"
+elif test "x$prefix" != xNONE; then
+ set x "$prefix/share/config.site" "$prefix/etc/config.site"
-+else
+ else
+- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+- fi
+ set x "$ac_default_prefix/share/config.site" \
+ "$ac_default_prefix/etc/config.site"
fi
@@ -46929,7 +46665,6 @@
+echo "${ECHO_T}no" >&6; }
fi
-- STRIP=$ac_ct_STRIP
+ if test "x$ac_ct_STRIP" = x; then
+ STRIP=":"
+ else
@@ -46943,7 +46678,7 @@
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
-+ STRIP=$ac_ct_STRIP
+ STRIP=$ac_ct_STRIP
+ fi
else
STRIP="$ac_cv_prog_STRIP"
@@ -47001,7 +46736,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -1877,36 +2408,51 @@
+@@ -1877,26 +2408,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -47030,7 +46765,6 @@
+echo "${ECHO_T}no" >&6; }
fi
-- CC=$ac_ct_CC
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
@@ -47044,17 +46778,14 @@
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
-+ CC=$ac_ct_CC
+ CC=$ac_ct_CC
+ fi
else
CC="$ac_cv_prog_CC"
fi
-
- if test -z "$CC"; then
-- if test -n "$ac_tool_prefix"; then
-- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-+ if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+@@ -1905,8 +2451,8 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
@@ -47100,7 +46831,9 @@
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
--else
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
@@ -47111,31 +46844,28 @@
- ac_cv_prog_ac_ct_CC="cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-- fi
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
-done
-done
--
+
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
+-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
+-fi
- CC=$ac_ct_CC
-else
- CC="$ac_cv_prog_CC"
--fi
-
-+ fi
+ fi
+-
fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
@@ -47242,7 +46972,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2098,29 +2608,45 @@
+@@ -2098,30 +2608,46 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -47275,7 +47005,6 @@
test -n "$ac_ct_CC" && break
done
-- CC=$ac_ct_CC
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
@@ -47289,11 +47018,12 @@
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
-+ CC=$ac_ct_CC
-+ fi
+ CC=$ac_ct_CC
fi
++fi
fi
+
@@ -2133,21 +2659,35 @@
{ (exit 1); exit 1; }; }
@@ -47407,14 +47137,13 @@
# certainly right.
break;;
*.* )
-- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
++ then :; else
+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- # FIXME: I believe we export ac_cv_exeext for Libtool,
- # but it would be cool to find out if it's true. Does anybody
- # maintain Libtool? --akim.
- export ac_cv_exeext
-+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-+ then :; else
-+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ fi
+ # We set ac_cv_exeext here because the later test for it is not
+ # safe: cross compilers may not add the suffix if given an `-o'
@@ -47578,7 +47307,7 @@
if test "${ac_cv_c_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2377,50 +2959,49 @@
+@@ -2377,27 +2959,22 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -47617,10 +47346,9 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_compiler_gnu=no
-+ ac_compiler_gnu=no
+@@ -2405,21 +2982,25 @@
+
+ ac_compiler_gnu=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
@@ -47643,15 +47371,13 @@
if test "${ac_cv_prog_cc_g+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- cat >conftest.$ac_ext <<_ACEOF
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
-+ cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
- cat confdefs.h >>conftest.$ac_ext
@@ -2436,38 +3017,118 @@
}
_ACEOF
@@ -47995,7 +47721,7 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -48050,7 +47776,7 @@
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
-fi
--
+
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -48060,15 +47786,6 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -2748,7 +3266,7 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- DEPDIR="${am__leading_dot}deps"
-
-- ac_config_commands="$ac_config_commands depfiles"
-+ac_config_commands="$ac_config_commands depfiles"
-
-
- am_make=${MAKE-make}
@@ -2758,8 +3276,8 @@
.PHONY: am__doit
END
@@ -48398,25 +48115,25 @@
+IFS=$as_save_IFS
+
+
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
-
++fi
++
+GREP="$ac_cv_path_GREP"
+if test -z "$GREP"; then
+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
+fi
++
++else
++ ac_cv_path_GREP=$GREP
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
+
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-+else
-+ ac_cv_path_GREP=$GREP
-+fi
-+
-+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
@@ -48511,7 +48228,7 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3204,35 +3865,31 @@
+@@ -3204,27 +3865,22 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -48550,10 +48267,9 @@
ac_cv_header_stdc=yes
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_header_stdc=no
-+ ac_cv_header_stdc=no
+@@ -3232,7 +3888,8 @@
+
+ ac_cv_header_stdc=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
@@ -48634,7 +48350,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -3375,38 +4044,35 @@
+@@ -3375,27 +4044,22 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -48673,10 +48389,9 @@
eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_Header=no"
-+ eval "$as_ac_Header=no"
+@@ -3403,10 +4067,12 @@
+
+ eval "$as_ac_Header=no"
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
@@ -48773,7 +48488,6 @@
+echo "${ECHO_T}no" >&6; }
fi
-- RANLIB=$ac_ct_RANLIB
+ if test "x$ac_ct_RANLIB" = x; then
+ RANLIB=":"
+ else
@@ -48787,7 +48501,7 @@
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
-+ RANLIB=$ac_ct_RANLIB
+ RANLIB=$ac_ct_RANLIB
+ fi
else
RANLIB="$ac_cv_prog_RANLIB"
@@ -48825,7 +48539,7 @@
if test "${ac_cv_type_unsigned_long_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3545,61 +4227,57 @@
+@@ -3545,39 +4227,35 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -48879,10 +48593,9 @@
ac_cv_type_unsigned_long_long=yes
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_type_unsigned_long_long=no
-+ ac_cv_type_unsigned_long_long=no
+@@ -3585,21 +4263,21 @@
+
+ ac_cv_type_unsigned_long_long=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
@@ -48895,20 +48608,20 @@
-echo "$as_me:$LINENO: checking size of unsigned long long" >&5
-echo $ECHO_N "checking size of unsigned long long... $ECHO_C" >&6
+-if test "${ac_cv_sizeof_unsigned_long_long+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test "$ac_cv_type_unsigned_long_long" = yes; then
+- # The cast to unsigned long works around a bug in the HP C Compiler
+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of unsigned long long" >&5
+echo $ECHO_N "checking size of unsigned long long... $ECHO_C" >&6; }
- if test "${ac_cv_sizeof_unsigned_long_long+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- if test "$ac_cv_type_unsigned_long_long" = yes; then
-- # The cast to unsigned long works around a bug in the HP C Compiler
-- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-- # This bug is HP SR number 8606223364.
++if test "${ac_cv_sizeof_unsigned_long_long+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
@@ -48977,7 +48690,7 @@
test_array [0] = 0
;
-@@ -3661,56 +4336,53 @@
+@@ -3661,27 +4336,22 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -49016,20 +48729,9 @@
ac_hi=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_lo=`expr $ac_mid + 1`
-- if test $ac_lo -le $ac_mid; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid + 1`
-+ ac_lo=`expr $ac_mid + 1`
-+ if test $ac_lo -le $ac_mid; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid + 1`
+@@ -3694,7 +4364,8 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
@@ -49037,13 +48739,7 @@
done
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--cat >conftest.$ac_ext <<_ACEOF
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
+@@ -3707,10 +4378,11 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -49108,7 +48804,7 @@
test_array [0] = 0
;
-@@ -3759,50 +4427,48 @@
+@@ -3759,27 +4427,22 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -49147,20 +48843,9 @@
ac_lo=$ac_mid; break
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_hi=`expr '(' $ac_mid ')' - 1`
-- if test $ac_mid -le $ac_hi; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid`
-+ ac_hi=`expr '(' $ac_mid ')' - 1`
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid`
+@@ -3792,7 +4455,8 @@
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
@@ -49168,10 +48853,9 @@
done
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_lo= ac_hi=
-+ ac_lo= ac_hi=
+@@ -3800,9 +4464,11 @@
+
+ ac_lo= ac_hi=
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
@@ -49196,7 +48880,7 @@
test_array [0] = 0
;
-@@ -3824,52 +4491,45 @@
+@@ -3824,27 +4491,22 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -49235,10 +48919,9 @@
ac_hi=$ac_mid
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_lo=`expr '(' $ac_mid ')' + 1`
-+ ac_lo=`expr '(' $ac_mid ')' + 1`
+@@ -3852,23 +4514,21 @@
+
+ ac_lo=`expr '(' $ac_mid ')' + 1`
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
@@ -49254,11 +48937,8 @@
+echo "$as_me: error: cannot compute sizeof (unsigned long long)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
+-esac
+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_unsigned_long_long=0
-+ fi ;;
- esac
else
- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
@@ -49266,10 +48946,12 @@
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
--else
++ ac_cv_sizeof_unsigned_long_long=0
++ fi ;;
++esac
+ else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
- _ACEOF
@@ -3877,8 +4537,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -49352,12 +49034,11 @@
+echo "$as_me: error: cannot compute sizeof (unsigned long long)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
+ else
+ ac_cv_sizeof_unsigned_long_long=0
-+ fi
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
@@ -49376,41 +49057,44 @@
cat >>confdefs.h <<_ACEOF
#define SIZEOF_UNSIGNED_LONG_LONG $ac_cv_sizeof_unsigned_long_long
_ACEOF
-@@ -3956,129 +4629,21 @@
+@@ -3956,8 +4629,8 @@
fi
# FIXME
-echo "$as_me:$LINENO: checking whether __i386__ is declared" >&5
-echo $ECHO_N "checking whether __i386__ is declared... $ECHO_C" >&6
--if test "${ac_cv_have_decl___i386__+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--int
--main ()
--{
--#ifndef __i386__
++{ echo "$as_me:$LINENO: checking whether __i386__ is declared" >&5
++echo $ECHO_N "checking whether __i386__ is declared... $ECHO_C" >&6; }
+ if test "${ac_cv_have_decl___i386__+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3972,7 +4645,7 @@
+ main ()
+ {
+ #ifndef __i386__
- char *p = (char *) __i386__;
--#endif
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
++ (void) __i386__;
+ #endif
+
+ ;
+@@ -3980,27 +4653,22 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
@@ -49425,50 +49109,56 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_have_decl___i386__=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_have_decl___i386__=no
--fi
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ ac_cv_have_decl___i386__=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -4008,18 +4676,19 @@
+
+ ac_cv_have_decl___i386__=no
+ fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
-echo "$as_me:$LINENO: result: $ac_cv_have_decl___i386__" >&5
-echo "${ECHO_T}$ac_cv_have_decl___i386__" >&6
--if test $ac_cv_have_decl___i386__ = yes; then
-- :
--else
--
--
--if test x$enable_bgl != xyes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_have_decl___i386__" >&5
++echo "${ECHO_T}$ac_cv_have_decl___i386__" >&6; }
+ if test $ac_cv_have_decl___i386__ = yes; then
+ :
+ else
+
+
+ if test x$enable_bgl != xyes; then
-echo "$as_me:$LINENO: checking if $CC accepts -m64" >&5
-echo $ECHO_N "checking if $CC accepts -m64... $ECHO_C" >&6
--CC_save="$CC"
--CC="$CC -m64"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
++{ echo "$as_me:$LINENO: checking if $CC accepts -m64" >&5
++echo $ECHO_N "checking if $CC accepts -m64... $ECHO_C" >&6; }
+ CC_save="$CC"
+ CC="$CC -m64"
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -4038,42 +4707,38 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
@@ -49483,45 +49173,35 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
--
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
--
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-- CC="$CC_save"
--
--fi
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ CC="$CC_save"
+
+ fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--
--
--fi
--
-+#AC_CHECK_DECL([__i386__], [], [
-+#
-+#if test x$enable_bgl != xyes; then
-+#AC_MSG_CHECKING([if $CC accepts -m64])
-+#CC_save="$CC"
-+#CC="$CC -m64"
-+#AC_TRY_COMPILE([],[],[
-+# AC_MSG_RESULT([yes])
-+#],[
-+# AC_MSG_RESULT([no])
-+# CC="$CC_save"
-+#])
-+#fi
-+#
-+#])
-
- CPPFLAGS="-I\$(top_builddir)/lnet/include -I\$(top_srcdir)/lnet/include -I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS"
-
-@@ -4093,40 +4658,40 @@
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+
+
+@@ -4093,40 +4758,40 @@
@@ -49581,7 +49261,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -r "$LINUX"; then
-@@ -4135,8 +4700,9 @@
+@@ -4135,8 +4800,9 @@
eval "$as_lb_File=no"
fi
fi
@@ -49593,7 +49273,7 @@
if test `eval echo '${'$as_lb_File'}'` = yes; then
:
else
-@@ -4147,33 +4713,33 @@
+@@ -4147,33 +4813,33 @@
# -------- linux objects (for 2.6) --
@@ -49641,7 +49321,7 @@
if test "${lb_cv_file__boot_kernel_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4183,13 +4749,13 @@
+@@ -4183,13 +4849,13 @@
lb_cv_file__boot_kernel_h=no
fi
fi
@@ -49659,7 +49339,7 @@
if test "${lb_cv_file__var_adm_running_kernel_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4199,8 +4765,8 @@
+@@ -4199,8 +4865,8 @@
lb_cv_file__var_adm_running_kernel_h=no
fi
fi
@@ -49670,7 +49350,7 @@
if test $lb_cv_file__var_adm_running_kernel_h = yes; then
KERNEL_SOURCE_HEADER='/var/adm/running-kernel.h'
fi
-@@ -4209,17 +4775,17 @@
+@@ -4209,17 +4875,17 @@
@@ -49695,7 +49375,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -r "$LINUX_CONFIG"; then
-@@ -4228,8 +4794,9 @@
+@@ -4228,8 +4894,9 @@
eval "$as_lb_File=no"
fi
fi
@@ -49707,7 +49387,7 @@
if test `eval echo '${'$as_lb_File'}'` = yes; then
:
else
-@@ -4244,9 +4811,9 @@
+@@ -4244,9 +4911,9 @@
# and at more old has only one line
# include <autoconf.h>
as_lb_File=`echo "lb_cv_file_$LINUX_OBJ/include/linux/autoconf.h" | $as_tr_sh`
@@ -49720,7 +49400,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -r "$LINUX_OBJ/include/linux/autoconf.h"; then
-@@ -4255,8 +4822,9 @@
+@@ -4255,8 +4922,9 @@
eval "$as_lb_File=no"
fi
fi
@@ -49732,7 +49412,7 @@
if test `eval echo '${'$as_lb_File'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -4270,9 +4838,9 @@
+@@ -4270,9 +4938,9 @@
{ (exit 1); exit 1; }; }
fi
as_lb_File=`echo "lb_cv_file_$LINUX_OBJ/include/linux/version.h" | $as_tr_sh`
@@ -49745,7 +49425,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -r "$LINUX_OBJ/include/linux/version.h"; then
-@@ -4281,8 +4849,9 @@
+@@ -4281,8 +4949,9 @@
eval "$as_lb_File=no"
fi
fi
@@ -49757,7 +49437,7 @@
if test `eval echo '${'$as_lb_File'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -4309,9 +4878,9 @@
+@@ -4309,9 +4978,9 @@
# enable extensive workarounds to get this to build
# modules
as_lb_File=`echo "lb_cv_file_$KERNEL_SOURCE_HEADER" | $as_tr_sh`
@@ -49770,7 +49450,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -r "$KERNEL_SOURCE_HEADER"; then
-@@ -4320,8 +4889,9 @@
+@@ -4320,8 +4989,9 @@
eval "$as_lb_File=no"
fi
fi
@@ -49782,7 +49462,7 @@
if test `eval echo '${'$as_lb_File'}'` = yes; then
if test $KERNEL_SOURCE_HEADER = '/boot/kernel.h' ; then
{ echo "$as_me:$LINENO: WARNING: Using /boot/kernel.h from RUNNING kernel." >&5
-@@ -4344,30 +4914,30 @@
+@@ -4344,30 +5014,30 @@
ARCH_UM=
UML_CFLAGS=
@@ -49824,7 +49504,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -r "$LINUX/include/linux/namei.h"; then
-@@ -4376,8 +4946,9 @@
+@@ -4376,8 +5046,9 @@
eval "$as_lb_File=no"
fi
fi
@@ -49836,7 +49516,7 @@
if test `eval echo '${'$as_lb_File'}'` = yes; then
linux25="yes"
-@@ -4390,16 +4961,16 @@
+@@ -4390,16 +5061,16 @@
fi
@@ -49859,7 +49539,7 @@
rm -f build/conftest.i
cat >conftest.c <<_ACEOF
/* confdefs.h. */
-@@ -4430,8 +5001,8 @@
+@@ -4430,8 +5101,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -49870,7 +49550,7 @@
else
echo "$as_me: failed program was:" >&5
-@@ -4469,8 +5040,8 @@
+@@ -4469,8 +5140,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -49881,7 +49561,7 @@
else
echo "$as_me: failed program was:" >&5
-@@ -4496,8 +5067,8 @@
+@@ -4496,8 +5167,8 @@
# --- check that we can build modules at all
@@ -49892,7 +49572,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -4527,16 +5098,16 @@
+@@ -4527,16 +5198,16 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -49913,7 +49593,7 @@
{ echo "$as_me:$LINENO: WARNING: Consult config.log for details." >&5
echo "$as_me: WARNING: Consult config.log for details." >&2;}
{ echo "$as_me:$LINENO: WARNING: If you are trying to build with a kernel-source rpm, consult build/README.kernel-source" >&5
-@@ -4550,8 +5121,8 @@
+@@ -4550,8 +5221,8 @@
LINUXRELEASE=
rm -f build/conftest.i
@@ -49924,7 +49604,7 @@
if test -s $LINUX_OBJ/include/linux/utsrelease.h ; then
LINUXRELEASEHEADER=utsrelease.h
else
-@@ -4603,8 +5174,8 @@
+@@ -4603,8 +5274,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -49935,7 +49615,7 @@
{ { echo "$as_me:$LINENO: error: Could not preprocess test program. Consult config.log for details." >&5
echo "$as_me: error: Could not preprocess test program. Consult config.log for details." >&2;}
{ (exit 1); exit 1; }; }
-@@ -4613,14 +5184,14 @@
+@@ -4613,14 +5284,14 @@
rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
rm -f build/conftest.i
if test x$LINUXRELEASE = x ; then
@@ -49954,7 +49634,7 @@
moduledir='/lib/modules/'$LINUXRELEASE/kernel
-@@ -4633,17 +5204,17 @@
+@@ -4633,17 +5304,17 @@
# ------------ RELEASE --------------------------------
@@ -49978,7 +49658,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -4681,8 +5252,8 @@
+@@ -4681,8 +5352,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -49989,7 +49669,7 @@
else
-@@ -4690,8 +5261,8 @@
+@@ -4690,8 +5361,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -50000,7 +49680,7 @@
{ { echo "$as_me:$LINENO: error: module support is required to build Lustre kernel modules." >&5
echo "$as_me: error: module support is required to build Lustre kernel modules." >&2;}
-@@ -4702,8 +5273,8 @@
+@@ -4702,8 +5373,8 @@
rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
@@ -50011,7 +49691,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -4741,8 +5312,8 @@
+@@ -4741,8 +5412,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -50022,7 +49702,7 @@
else
-@@ -4750,16 +5321,16 @@
+@@ -4750,16 +5421,16 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -50043,7 +49723,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -4797,8 +5368,8 @@
+@@ -4797,8 +5468,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -50054,7 +49734,7 @@
{ { echo "$as_me:$LINENO: error: Lustre does not support kernels with preempt enabled." >&5
echo "$as_me: error: Lustre does not support kernels with preempt enabled." >&2;}
-@@ -4810,16 +5381,16 @@
+@@ -4810,16 +5481,16 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -50075,7 +49755,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -4857,8 +5428,8 @@
+@@ -4857,8 +5528,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -50086,7 +49766,7 @@
else
-@@ -4866,8 +5437,8 @@
+@@ -4866,8 +5537,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -50097,7 +49777,7 @@
if test "x$ARCH_UM" = "x" ; then
{ { echo "$as_me:$LINENO: error: Lustre requires that CONFIG_KALLSYMS is enabled in your kernel." >&5
-@@ -4880,8 +5451,8 @@
+@@ -4880,8 +5551,8 @@
rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko build/conftest.c conftest.c
@@ -50108,7 +49788,7 @@
cat >conftest.c <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -4919,8 +5490,8 @@
+@@ -4919,8 +5590,8 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -50119,7 +49799,7 @@
else
-@@ -4928,8 +5499,8 @@
+@@ -4928,8 +5599,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -50130,7 +49810,7 @@
{ echo "$as_me:$LINENO: WARNING: " >&5
echo "$as_me: WARNING: " >&2;}
-@@ -4949,9 +5520,9 @@
+@@ -4949,9 +5620,9 @@
# Find the modpost utility
as_ac_File=`echo "ac_cv_file_$LINUX_OBJ/scripts/mod/modpost" | $as_tr_sh`
@@ -50143,7 +49823,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
test "$cross_compiling" = yes &&
-@@ -4964,15 +5535,16 @@
+@@ -4964,15 +5635,16 @@
eval "$as_ac_File=no"
fi
fi
@@ -50165,7 +49845,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
test "$cross_compiling" = yes &&
-@@ -4985,8 +5557,9 @@
+@@ -4985,8 +5657,9 @@
eval "$as_ac_File=no"
fi
fi
@@ -50177,7 +49857,7 @@
if test `eval echo '${'$as_ac_File'}'` = yes; then
MODPOST=$LINUX_OBJ/scripts/modpost
else
-@@ -5002,11 +5575,11 @@
+@@ -5002,11 +5675,11 @@
# Ensure it can run
@@ -50193,7 +49873,7 @@
else
{ { echo "$as_me:$LINENO: error: modpost can not be run." >&5
echo "$as_me: error: modpost can not be run." >&2;}
-@@ -5014,22 +5587,22 @@
+@@ -5014,15 +5687,15 @@
fi
# Check if modpost supports (and therefore requires) -m
@@ -50215,15 +49895,7 @@
MODPOST_ARGS=""
fi
-
- fi
-
-- ac_config_headers="$ac_config_headers config.h"
-+ac_config_headers="$ac_config_headers config.h"
-
- CPPFLAGS="-include \$(top_builddir)/config.h $CPPFLAGS"
- EXTRA_KCFLAGS="-include $PWD/config.h $EXTRA_KCFLAGS"
-@@ -5081,22 +5654,22 @@
+@@ -5081,22 +5754,22 @@
LDISKFSDIR="$PWD/ldiskfs"
@@ -50256,7 +49928,7 @@
if test "${ac_cv_path_PATCH+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5111,36 +5684,37 @@
+@@ -5111,36 +5784,37 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -50302,7 +49974,7 @@
if test "${ac_cv_path_QUILT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5155,28 +5729,29 @@
+@@ -5155,28 +5829,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -50338,7 +50010,7 @@
fi
if test x$enable_ldiskfs$PATCH$QUILT = xyesnono ; then
-@@ -5219,8 +5794,8 @@
+@@ -5219,8 +5894,8 @@
@@ -50349,19 +50021,20 @@
case $LINUXRELEASE in
2.6.5*) LDISKFS_SERIES="2.6-suse.series" ;;
2.6.9*) LDISKFS_SERIES="2.6-rhel4.series" ;;
-@@ -5231,21 +5806,28 @@
+@@ -5231,12 +5906,20 @@
2.6.16*) LDISKFS_SERIES="2.6-sles10.series";;
2.6.18-*el5*) LDISKFS_SERIES="2.6-rhel5.series";;
2.6.18-*prep*) LDISKFS_SERIES="2.6-rhel5.series";;
-2.6.18*) LDISKFS_SERIES="2.6.18-vanilla.series";;
+2.6.18*) if test -e $LINUX_OBJ/version.Debian; then
+ LDISKFS_SERIES="2.6.18-debian.series"
-+ else
++ else
+ LDISKFS_SERIES="2.6.18-vanilla.series"
-+ fi;;
++ fi;;
+2.6.20*) LDISKFS_SERIES="2.6.20-vanilla.series";;
+2.6.21*) LDISKFS_SERIES="2.6.21-vanilla.series";;
+2.6.22*) LDISKFS_SERIES="2.6.22-vanilla.series";;
++2.6.23*) LDISKFS_SERIES="2.6.23-vanilla.series";;
*) { echo "$as_me:$LINENO: WARNING: Unknown kernel version $LINUXRELEASE, fix ldiskfs/configure.ac" >&5
echo "$as_me: WARNING: Unknown kernel version $LINUXRELEASE, fix ldiskfs/configure.ac" >&2;}
esac
@@ -50372,18 +50045,7 @@
-
-
-- ac_config_files="$ac_config_files Makefile autoMakefile Rules:build/Rules.in lustre-ldiskfs.spec"
-+ac_config_files="$ac_config_files Makefile autoMakefile Rules:build/Rules.in lustre-ldiskfs.spec"
-
-
-- ac_config_files="$ac_config_files ldiskfs/autoMakefile ldiskfs/Makefile"
-+ac_config_files="$ac_config_files ldiskfs/autoMakefile ldiskfs/Makefile"
-
-
- MOSTLYCLEANFILES='.*.cmd .*.flags *.o *.ko *.mod.c .depend .*.1.*'
-@@ -5269,39 +5851,58 @@
+@@ -5269,39 +5952,58 @@
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -50434,17 +50096,15 @@
sed '
+ /^ac_cv_env_/b end
t clear
-- : clear
-+ :clear
+ : clear
s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
t end
- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-- : end' >>confcache
++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+ : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
- if test -w $cache_file; then
- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+ :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+ if test -w "$cache_file"; then
+ test "x$cache_file" != "x/dev/null" &&
@@ -50458,7 +50118,7 @@
fi
fi
rm -f confcache
-@@ -5310,32 +5911,18 @@
+@@ -5310,32 +6012,18 @@
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -50497,7 +50157,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -5415,17 +6002,45 @@
+@@ -5415,73 +6103,26 @@
## M4sh Initialization. ##
## --------------------- ##
@@ -50512,45 +50172,91 @@
alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
- set -o posix
+-fi
+-DUALCASE=1; export DUALCASE # for MKS sh
+-
+-# Support unset when possible.
+-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+- as_unset=unset
+-else
+- as_unset=false
+-fi
+-
+-
+-# Work around bugs in pre-3.0 UWIN ksh.
+-$as_unset ENV MAIL MAILPATH
+-PS1='$ '
+-PS2='> '
+-PS4='+ '
+-
+-# NLS nuisances.
+-for as_var in \
+- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+- LC_TELEPHONE LC_TIME
+-do
+- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+- eval $as_var=C; export $as_var
+- else
+- $as_unset $as_var
+- fi
+-done
+-
+-# Required to use basename.
+-if expr a : '\(a\)' >/dev/null 2>&1; then
+- as_expr=expr
+ setopt NO_GLOB_SUBST
-+else
+ else
+- as_expr=false
+-fi
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
-+
-+fi
-+
-+
-+
-+
+
+-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+- as_basename=basename
+-else
+- as_basename=false
+ fi
+
+
+-# Name of the executable.
+-as_me=`$as_basename "$0" ||
+-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+- X"$0" : 'X\(//\)$' \| \
+- X"$0" : 'X\(/\)$' \| \
+- . : '\(.\)' 2>/dev/null ||
+-echo X/"$0" |
+- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+- /^X\/\(\/\/\)$/{ s//\1/; q; }
+- /^X\/\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`
+
+
+-# PATH needs CR, and LINENO needs CR and PATH.
+# PATH needs CR
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+ echo "#! /bin/sh" >conf$$.sh
-+ echo "exit 0" >>conf$$.sh
-+ chmod +x conf$$.sh
-+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+ PATH_SEPARATOR=';'
-+ else
-+ PATH_SEPARATOR=:
-+ fi
-+ rm -f conf$$.sh
+ # Avoid depending upon Character Ranges.
+ as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+ as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+@@ -5502,14 +6143,24 @@
+ rm -f conf$$.sh
fi
--DUALCASE=1; export DUALCASE # for MKS sh
-
- # Support unset when possible.
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -5435,8 +6050,43 @@
- fi
-
-
+
++# Support unset when possible.
++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
++ as_unset=unset
++else
++ as_unset=false
++fi
++
+
+- as_lineno_1=$LINENO
+- as_lineno_2=$LINENO
+- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+- test "x$as_lineno_1" != "x$as_lineno_2" &&
+- test "x$as_lineno_3" = "x$as_lineno_2" || {
+- # Find who we are. Look in the path if we contain no path at all
+- # relative or not.
+# IFS
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent editors from complaining about space-tab.
@@ -50561,77 +50267,80 @@
+IFS=" "" $as_nl"
+
+# Find who we are. Look in the path if we contain no directory separator.
-+case $0 in
-+ *[\\/]* ) as_myself=$0 ;;
-+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
+ case $0 in
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -5519,6 +6170,7 @@
+ test -z "$as_dir" && as_dir=.
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
+IFS=$as_save_IFS
-+
-+ ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+ as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
+
+ ;;
+ esac
+@@ -5528,100 +6180,161 @@
+ as_myself=$0
+ fi
+ if test ! -f "$as_myself"; then
+- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
+-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
+- { (exit 1); exit 1; }; }
+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ { (exit 1); exit 1; }
-+fi
-+
- # Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
+ fi
+- case $CONFIG_SHELL in
+- '')
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++
++# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
- PS1='$ '
- PS2='> '
- PS4='+ '
-@@ -5450,18 +6100,19 @@
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
-- $as_unset $as_var
++PS1='$ '
++PS2='> '
++PS4='+ '
++
++# NLS nuisances.
++for as_var in \
++ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++ LC_TELEPHONE LC_TIME
+ do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for as_base in sh bash ksh sh5; do
+- case $as_dir in
+- /*)
+- if ("$as_dir/$as_base" -c '
++ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
++ eval $as_var=C; export $as_var
++ else
+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
- done
-
- # Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
++ fi
++done
++
++# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
- else
- as_expr=false
- fi
-
--if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++ as_expr=expr
++else
++ as_expr=false
++fi
++
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
- else
- as_basename=false
-@@ -5469,159 +6120,120 @@
-
-
- # Name of the executable.
--as_me=`$as_basename "$0" ||
++ as_basename=basename
++else
++ as_basename=false
++fi
++
++
++# Name of the executable.
+as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)$' \| \
-- . : '\(.\)' 2>/dev/null ||
++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
++ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X/"$0" |
-- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-- /^X\/\(\/\/\)$/{ s//\1/; q; }
-- /^X\/\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
--
++echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
@@ -50645,75 +50354,16 @@
+ q
+ }
+ s/.*/./; q'`
-
--# PATH needs CR, and LINENO needs CR and PATH.
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
++
+# CDPATH.
+$as_unset CDPATH
-
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
-- echo "#! /bin/sh" >conf$$.sh
-- echo "exit 0" >>conf$$.sh
-- chmod +x conf$$.sh
-- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-- PATH_SEPARATOR=';'
-- else
-- PATH_SEPARATOR=:
-- fi
-- rm -f conf$$.sh
--fi
-
-
++
++
++
as_lineno_1=$LINENO
as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
test "x$as_lineno_1" != "x$as_lineno_2" &&
-- test "x$as_lineno_3" = "x$as_lineno_2" || {
-- # Find who we are. Look in the path if we contain no path at all
-- # relative or not.
-- case $0 in
-- *[\\/]* ) as_myself=$0 ;;
-- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
--done
--
-- ;;
-- esac
-- # We did not find ourselves, most probably we were run as `sh COMMAND'
-- # in which case we are not to be found in the path.
-- if test "x$as_myself" = x; then
-- as_myself=$0
-- fi
-- if test ! -f "$as_myself"; then
-- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
--echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-- { (exit 1); exit 1; }; }
-- fi
-- case $CONFIG_SHELL in
-- '')
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for as_base in sh bash ksh sh5; do
-- case $as_dir in
-- /*)
-- if ("$as_dir/$as_base" -c '
-- as_lineno_1=$LINENO
-- as_lineno_2=$LINENO
-- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
@@ -50755,9 +50405,8 @@
+ :lineno
N
- s,$,-,
-- : loop
+ : loop
- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+ :loop
+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
t loop
- s,-$,,
@@ -50825,16 +50474,16 @@
- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
- if test -f conf$$.exe; then
- # Don't use ln at all; we don't have any links
-+ as_ln_s='ln -s'
+- as_ln_s='cp -p'
+- else
+ as_ln_s='ln -s'
+- fi
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
-- else
-- as_ln_s='ln -s'
-- fi
++ as_ln_s='cp -p'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
@@ -50846,7 +50495,7 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
-@@ -5630,7 +6242,28 @@
+@@ -5630,7 +6343,28 @@
as_mkdir_p=false
fi
@@ -50876,7 +50525,7 @@
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -5639,31 +6272,14 @@
+@@ -5639,31 +6373,14 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -50912,7 +50561,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -5671,30 +6287,20 @@
+@@ -5671,30 +6388,20 @@
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -50951,7 +50600,7 @@
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -5702,7 +6308,7 @@
+@@ -5702,7 +6409,7 @@
Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
@@ -50960,7 +50609,7 @@
-q, --quiet do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
-@@ -5721,19 +6327,21 @@
+@@ -5721,19 +6428,21 @@
$config_commands
Report bugs to <bug-autoconf at gnu.org>."
@@ -50988,7 +50637,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -5744,39 +6352,24 @@
+@@ -5744,39 +6453,24 @@
do
case $1 in
--*=*)
@@ -51034,7 +50683,7 @@
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
-@@ -5786,18 +6379,24 @@
+@@ -5786,18 +6480,24 @@
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
@@ -51064,7 +50713,7 @@
esac
shift
-@@ -5813,42 +6412,54 @@
+@@ -5813,42 +6513,54 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
@@ -51107,23 +50756,17 @@
do
- case "$ac_config_target" in
- # Handling of arguments.
-- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-- "autoMakefile" ) CONFIG_FILES="$CONFIG_FILES autoMakefile" ;;
-- "Rules" ) CONFIG_FILES="$CONFIG_FILES Rules:build/Rules.in" ;;
-- "lustre-ldiskfs.spec" ) CONFIG_FILES="$CONFIG_FILES lustre-ldiskfs.spec" ;;
-- "ldiskfs/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES ldiskfs/autoMakefile" ;;
-- "ldiskfs/Makefile" ) CONFIG_FILES="$CONFIG_FILES ldiskfs/Makefile" ;;
-- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+ case $ac_config_target in
+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-+ "autoMakefile") CONFIG_FILES="$CONFIG_FILES autoMakefile" ;;
-+ "Rules") CONFIG_FILES="$CONFIG_FILES Rules:build/Rules.in" ;;
-+ "lustre-ldiskfs.spec") CONFIG_FILES="$CONFIG_FILES lustre-ldiskfs.spec" ;;
-+ "ldiskfs/autoMakefile") CONFIG_FILES="$CONFIG_FILES ldiskfs/autoMakefile" ;;
-+ "ldiskfs/Makefile") CONFIG_FILES="$CONFIG_FILES ldiskfs/Makefile" ;;
+ "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+ "autoMakefile" ) CONFIG_FILES="$CONFIG_FILES autoMakefile" ;;
+ "Rules" ) CONFIG_FILES="$CONFIG_FILES Rules:build/Rules.in" ;;
+ "lustre-ldiskfs.spec" ) CONFIG_FILES="$CONFIG_FILES lustre-ldiskfs.spec" ;;
+ "ldiskfs/autoMakefile" ) CONFIG_FILES="$CONFIG_FILES ldiskfs/autoMakefile" ;;
+ "ldiskfs/Makefile" ) CONFIG_FILES="$CONFIG_FILES ldiskfs/Makefile" ;;
+- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -51135,7 +50778,7 @@
# If the user did not use the arguments to specify the items to instantiate,
# then the envvar interface is used. Set only those that are not.
# We use the long form for the default assignment because of an extremely
-@@ -5860,622 +6471,611 @@
+@@ -5860,373 +6572,480 @@
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -51325,30 +50968,6 @@
- while $ac_more_lines; do
- if test $ac_beg -gt 1; then
- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-- else
-- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-- fi
-- if test ! -s $tmp/subs.frag; then
-- ac_more_lines=false
-- else
-- # The purpose of the label and of the branching condition is to
-- # speed up the sed processing (if there are no `@' at all, there
-- # is no need to browse any of the substitutions).
-- # These are the two extra sed commands mentioned above.
-- (echo ':t
-- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-- if test -z "$ac_sed_cmds"; then
-- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-- else
-- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-- fi
-- ac_sed_frag=`expr $ac_sed_frag + 1`
-- ac_beg=$ac_end
-- ac_end=`expr $ac_end + $ac_max_sed_lines`
-- fi
-- done
-- if test -z "$ac_sed_cmds"; then
-- ac_sed_cmds=cat
+
+
+ac_delim='%!_!# '
@@ -51459,22 +51078,38 @@
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
-+ else
+ else
+- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
--fi # test -n "$CONFIG_FILES"
+ fi
+- if test ! -s $tmp/subs.frag; then
+- ac_more_lines=false
+- else
+- # The purpose of the label and of the branching condition is to
+- # speed up the sed processing (if there are no `@' at all, there
+- # is no need to browse any of the substitutions).
+- # These are the two extra sed commands mentioned above.
+- (echo ':t
+- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+- if test -z "$ac_sed_cmds"; then
+- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+- else
+- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+done
-
++
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+ ac_eof=`expr $ac_eof + 1`
-+fi
+ fi
+- ac_sed_frag=`expr $ac_sed_frag + 1`
+- ac_beg=$ac_end
+- ac_end=`expr $ac_end + $ac_max_sed_lines`
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
- _ACEOF
++_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
@@ -51531,19 +51166,22 @@
+ { (exit 1); exit 1; }; }
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+ fi
-+done
+ fi
+ done
+- if test -z "$ac_sed_cmds"; then
+- ac_sed_cmds=cat
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+ ac_eof=`expr $ac_eof + 1`
-+fi
-+
+ fi
+-fi # test -n "$CONFIG_FILES"
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-+_ACEOF
+ _ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
@@ -51594,7 +51232,7 @@
+do
+ case $ac_tag in
+ :[FHLC]) ac_mode=$ac_tag; continue;;
-+ esac
+ esac
+ case $ac_mode$ac_tag in
+ :[FHL]*:*);;
+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
@@ -51602,7 +51240,7 @@
+ { (exit 1); exit 1; }; };;
+ :[FH]-) ac_tag=-:-;;
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
- esac
++ esac
+ ac_save_IFS=$IFS
+ IFS=:
+ set x $ac_tag
@@ -51665,11 +51303,6 @@
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-- { if $as_mkdir_p; then
-- mkdir -p "$ac_dir"
-- else
-- as_dir="$ac_dir"
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
@@ -51686,7 +51319,11 @@
+ s//\1/
+ q
+ }
-+ s/.*/./; q'`
+ s/.*/./; q'`
+- { if $as_mkdir_p; then
+- mkdir -p "$ac_dir"
+- else
+- as_dir="$ac_dir"
+ { as_dir="$ac_dir"
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
@@ -51714,7 +51351,6 @@
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
@@ -51731,7 +51367,7 @@
+ s//\1/
+ q
+ }
-+ s/.*/./; q'`
+ s/.*/./; q'`
+ test -d "$as_dir" && break
done
- test ! -n "$as_dirs" || mkdir $as_dirs
@@ -51890,8 +51526,6 @@
-echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
- fi;;
-- esac
-- done` || { (exit 1); exit 1; }
+case `sed -n '/datarootdir/ {
+ p
+ q
@@ -51906,8 +51540,8 @@
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF
+ ac_datarootdir_hack='
+ s&@datadir@&$datadir&g
+ s&@docdir@&$docdir&g
@@ -51915,16 +51549,17 @@
+ s&@localedir@&$localedir&g
+ s&@mandir@&$mandir&g
+ s&\\\${datarootdir}&$datarootdir&g' ;;
-+esac
-+_ACEOF
+ esac
+- done` || { (exit 1); exit 1; }
+ _ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
-+cat >>$CONFIG_STATUS <<_ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
$extrasub
- _ACEOF
+@@ -6234,248 +7053,130 @@
cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -51946,14 +51581,6 @@
- cat $tmp/out
- rm -f $tmp/out
- fi
--
--done
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
--
--#
--# CONFIG_HEADER section.
--#
+s&@configure_input@&$configure_input&;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@srcdir@&$ac_srcdir&;t t
@@ -51967,19 +51594,9 @@
+$ac_datarootdir_hack
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
--# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
--# NAME is the cpp macro being defined and VALUE is the value it is being given.
--#
--# ac_d sets the value in "#define NAME VALUE" lines.
--ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
--ac_dB='[ ].*$,\1#\2'
--ac_dC=' '
--ac_dD=',;t'
--# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
--ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
--ac_uB='$,\1#\2define\3'
--ac_uC=' '
--ac_uD=',;t'
+-done
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
@@ -51988,10 +51605,53 @@
+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined." >&2;}
++ rm -f "$tmp/stdin"
++ case $ac_file in
++ -) cat "$tmp/out"; rm -f "$tmp/out";;
++ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
++ esac
++ ;;
++ :H)
+ #
+-# CONFIG_HEADER section.
++ # CONFIG_HEADER
+ #
++_ACEOF
+
+-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
+-# NAME is the cpp macro being defined and VALUE is the value it is being given.
+-#
+-# ac_d sets the value in "#define NAME VALUE" lines.
+-ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
+-ac_dB='[ ].*$,\1#\2'
++# Transform confdefs.h into a sed script `conftest.defines', that
++# substitutes the proper values into config.h.in to produce config.h.
++rm -f conftest.defines conftest.tail
++# First, append a space to every undef/define line, to ease matching.
++echo 's/$/ /' >conftest.defines
++# Then, protect against being on the right side of a sed subst, or in
++# an unquoted here document, in config.status. If some macros were
++# called several times there might be several #defines for the same
++# symbol, which is useless. But do not sort them, since the last
++# AC_DEFINE must be honored.
++ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
++# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
++# NAME is the cpp macro being defined, VALUE is the value it is being given.
++# PARAMS is the parameter list in the macro definition--in most cases, it's
++# just an empty string.
++ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
++ac_dB='\\)[ (].*,\\1define\\2'
+ ac_dC=' '
+-ac_dD=',;t'
+-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
+-ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
+-ac_uB='$,\1#\2define\3'
+-ac_uC=' '
+-ac_uD=',;t'
+-
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-+ rm -f "$tmp/stdin"
- case $ac_file in
+- case $ac_file in
- - | *:- | *:-:* ) # input from stdin
- cat >$tmp/stdin
- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
@@ -51999,9 +51659,7 @@
- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- * ) ac_file_in=$ac_file.in ;;
-+ -) cat "$tmp/out"; rm -f "$tmp/out";;
-+ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
- esac
+- esac
-
- test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
@@ -52037,12 +51695,8 @@
- # Remove the trailing spaces.
- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
-
-+ ;;
-+ :H)
-+ #
-+ # CONFIG_HEADER
-+ #
- _ACEOF
+-_ACEOF
++ac_dD=' ,'
-# Transform confdefs.h into two sed scripts, `conftest.defines' and
-# `conftest.undefs', that substitutes the proper values into
@@ -52059,7 +51713,15 @@
-# 0-ary CPP macros) applies to n-ary macro definitions.
-# See the Autoconf documentation for `clear'.
-cat >confdef2sed.sed <<\_ACEOF
--s/[\\&,]/\\&/g
++uniq confdefs.h |
++ sed -n '
++ t rset
++ :rset
++ s/^[ ]*#[ ]*define[ ][ ]*//
++ t ok
++ d
++ :ok
+ s/[\\&,]/\\&/g
-s,[\\$`],\\&,g
-t clear
-: clear
@@ -52074,40 +51736,11 @@
-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
-rm -f confdef2sed.sed
-+# Transform confdefs.h into a sed script `conftest.defines', that
-+# substitutes the proper values into config.h.in to produce config.h.
-+rm -f conftest.defines conftest.tail
-+# First, append a space to every undef/define line, to ease matching.
-+echo 's/$/ /' >conftest.defines
-+# Then, protect against being on the right side of a sed subst, or in
-+# an unquoted here document, in config.status. If some macros were
-+# called several times there might be several #defines for the same
-+# symbol, which is useless. But do not sort them, since the last
-+# AC_DEFINE must be honored.
-+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-+# NAME is the cpp macro being defined, VALUE is the value it is being given.
-+# PARAMS is the parameter list in the macro definition--in most cases, it's
-+# just an empty string.
-+ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
-+ac_dB='\\)[ (].*,\\1define\\2'
-+ac_dC=' '
-+ac_dD=' ,'
-
--# This sed command replaces #undef with comments. This is necessary, for
-+uniq confdefs.h |
-+ sed -n '
-+ t rset
-+ :rset
-+ s/^[ ]*#[ ]*define[ ][ ]*//
-+ t ok
-+ d
-+ :ok
-+ s/[\\&,]/\\&/g
+ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
+ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
+ ' >>conftest.defines
-+
+
+-# This sed command replaces #undef with comments. This is necessary, for
+# Remove the space that was appended to ease matching.
+# Then replace #undef with comments. This is necessary, for
# example, in the case of _POSIX_SOURCE, which is predefined and required
@@ -52272,7 +51905,7 @@
# Compute $ac_file's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
-@@ -6486,135 +7086,39 @@
+@@ -6486,135 +7187,39 @@
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
@@ -52289,7 +51922,23 @@
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`/stamp-h$_am_stamp_count
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
+ s/.*/./; q'`/stamp-h$_am_stamp_count
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
@@ -52362,23 +52011,6 @@
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
-# Do not use `cd foo && pwd` to compute absolute paths, because
@@ -52418,11 +52050,10 @@
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
- esac;;
--esac
+ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
+echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
-+ esac
+ esac
- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
@@ -52434,7 +52065,7 @@
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
-@@ -6624,18 +7128,29 @@
+@@ -6624,17 +7229,28 @@
# each Makefile.in and add a new line on top of each file to say so.
# So let's grep whole file.
if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
@@ -52451,7 +52082,6 @@
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
@@ -52468,11 +52098,10 @@
+ s//\1/
+ q
+ }
-+ s/.*/./; q'`
+ s/.*/./; q'`
else
continue
- fi
-@@ -6663,53 +7178,79 @@
+@@ -6663,53 +7279,79 @@
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
@@ -52489,11 +52118,6 @@
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-- { if $as_mkdir_p; then
-- mkdir -p $dirpart/$fdir
-- else
-- as_dir=$dirpart/$fdir
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
@@ -52510,7 +52134,11 @@
+ s//\1/
+ q
+ }
-+ s/.*/./; q'`
+ s/.*/./; q'`
+- { if $as_mkdir_p; then
+- mkdir -p $dirpart/$fdir
+- else
+- as_dir=$dirpart/$fdir
+ { as_dir=$dirpart/$fdir
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
@@ -52538,7 +52166,6 @@
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
@@ -52555,7 +52182,7 @@
+ s//\1/
+ q
+ }
-+ s/.*/./; q'`
+ s/.*/./; q'`
+ test -d "$as_dir" && break
done
- test ! -n "$as_dirs" || mkdir $as_dirs
@@ -52581,9 +52208,132 @@
{ (exit 0); exit 0; }
_ACEOF
-diff -urNad lustre-1.6.2~/ldiskfs/ldiskfs/autoMakefile.in lustre-1.6.2/ldiskfs/ldiskfs/autoMakefile.in
---- lustre-1.6.2~/ldiskfs/ldiskfs/autoMakefile.in 2007-08-30 00:30:06.000000000 +0200
-+++ lustre-1.6.2/ldiskfs/ldiskfs/autoMakefile.in 2007-09-06 14:19:14.842545704 +0200
+diff -Nurwd orig/lustre-1.6.2/ldiskfs/configure.ac.orig lustre-1.6.2/ldiskfs/configure.ac.orig
+--- orig/lustre-1.6.2/ldiskfs/configure.ac.orig 1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.6.2/ldiskfs/configure.ac.orig 2007-09-14 13:54:05.000000000 +0200
+@@ -0,0 +1,91 @@
++# Process this file with autoconf to produce a configure script.
++
++AC_INIT([Lustre ldiskfs], 3.0.0, [https://bugzilla.lustre.org/])
++AC_CONFIG_SRCDIR([lustre-ldiskfs.spec.in])
++
++# Don't look for install-sh, etc. in ..
++AC_CONFIG_AUX_DIR([.])
++
++AC_CANONICAL_SYSTEM
++
++AM_INIT_AUTOMAKE
++
++AC_PROG_CC
++
++LB_CANONICAL_SYSTEM
++LB_INCLUDE_RULES
++LB_PROG_CC
++
++AC_MSG_CHECKING([whether to build kernel modules])
++AC_ARG_ENABLE([modules],
++ AC_HELP_STRING([--disable-modules],
++ [disable building of Lustre kernel modules]),
++ [],[
++ enable_modules='yes'
++ ])
++AC_MSG_RESULT([$enable_modules])
++
++if test x$enable_modules = xyes ; then
++ LB_PROG_LINUX
++ LB_LINUX_MODPOST
++fi
++
++LB_CONFIG_HEADERS
++
++# These allow Lustre Makefiles and autoMakefiles to be used unchanged.
++AM_CONDITIONAL(MODULES, true)
++AM_CONDITIONAL(LINUX, true)
++AM_CONDITIONAL(DARWIN, true)
++AM_CONDITIONAL(LINUX25, true)
++
++LDISKFSDIR="$PWD/ldiskfs"
++AC_SUBST(LDISKFSDIR)
++
++AC_MSG_CHECKING([whether to enable quilt for making ldiskfs])
++AC_ARG_ENABLE([quilt],
++ AC_HELP_STRING([--disable-quilt],[disable use of quilt for ldiskfs]),
++ [],[enable_quilt='yes'])
++AC_MSG_RESULT([$enable_quilt])
++
++AC_PATH_PROG(PATCH, patch, [no])
++
++if test x$enable_quilt = xno ; then
++ QUILT="no"
++else
++ AC_PATH_PROG(QUILT, quilt, [no])
++fi
++
++if test x$enable_ldiskfs$PATCH$QUILT = xyesnono ; then
++ AC_MSG_ERROR([Quilt or patch are needed to build the ldiskfs module])
++fi
++
++AM_CONDITIONAL(USE_QUILT, test x$QUILT != xno)
++
++LB_DEFINE_LDISKFS_OPTIONS
++
++AC_MSG_CHECKING([which ldiskfs series to use])
++case $LINUXRELEASE in
++2.6.5*) LDISKFS_SERIES="2.6-suse.series" ;;
++2.6.9*) LDISKFS_SERIES="2.6-rhel4.series" ;;
++2.6.10-ac*) LDISKFS_SERIES="2.6-fc3.series" ;;
++2.6.10*) LDISKFS_SERIES="2.6-rhel4.series" ;;
++2.6.12*) LDISKFS_SERIES="2.6.12-vanilla.series" ;;
++2.6.15*) LDISKFS_SERIES="2.6-fc5.series";;
++2.6.16*) LDISKFS_SERIES="2.6-sles10.series";;
++2.6.18-*el5*) LDISKFS_SERIES="2.6-rhel5.series";;
++2.6.18-*prep*) LDISKFS_SERIES="2.6-rhel5.series";;
++2.6.18*) LDISKFS_SERIES="2.6.18-vanilla.series";;
++*) AC_MSG_WARN([Unknown kernel version $LINUXRELEASE, fix ldiskfs/configure.ac])
++esac
++AC_MSG_RESULT([$LDISKFS_SERIES])
++AC_SUBST(LDISKFS_SERIES)
++
++AC_SUBST(ac_configure_args)
++
++LB_CONFIG_FILES
++AC_CONFIG_FILES([ldiskfs/autoMakefile ldiskfs/Makefile])
++
++MOSTLYCLEANFILES='.*.cmd .*.flags *.o *.ko *.mod.c .depend .*.1.*'
++AC_SUBST(MOSTLYCLEANFILES)
++
++AC_OUTPUT
+diff -Nurwd orig/lustre-1.6.2/ldiskfs/configure.ac.rej lustre-1.6.2/ldiskfs/configure.ac.rej
+--- orig/lustre-1.6.2/ldiskfs/configure.ac.rej 1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.6.2/ldiskfs/configure.ac.rej 2007-09-14 13:55:17.000000000 +0200
+@@ -0,0 +1,24 @@
++***************
++*** 74,87 ****
++ 2.6.16*) LDISKFS_SERIES="2.6-sles10.series";;
++ 2.6.18-*el5*) LDISKFS_SERIES="2.6-rhel5.series";;
++ 2.6.18-*prep*) LDISKFS_SERIES="2.6-rhel5.series";;
++- 2.6.18*) if test -e $LINUX_OBJ/version.Debian; then
++- LDISKFS_SERIES="2.6.18-debian.series"
++- else
++- LDISKFS_SERIES="2.6.18-vanilla.series"
++- fi;;
++- 2.6.20*) LDISKFS_SERIES="2.6.20-vanilla.series";;
++- 2.6.21*) LDISKFS_SERIES="2.6.21-vanilla.series";;
++- 2.6.22*) LDISKFS_SERIES="2.6.22-vanilla.series";;
++ *) AC_MSG_WARN([Unknown kernel version $LINUXRELEASE, fix ldiskfs/configure.ac])
++ esac
++ AC_MSG_RESULT([$LDISKFS_SERIES])
++--- 74,80 ----
++ 2.6.16*) LDISKFS_SERIES="2.6-sles10.series";;
++ 2.6.18-*el5*) LDISKFS_SERIES="2.6-rhel5.series";;
++ 2.6.18-*prep*) LDISKFS_SERIES="2.6-rhel5.series";;
+++ 2.6.18*) LDISKFS_SERIES="2.6.18-vanilla.series";;
++ *) AC_MSG_WARN([Unknown kernel version $LINUXRELEASE, fix ldiskfs/configure.ac])
++ esac
++ AC_MSG_RESULT([$LDISKFS_SERIES])
+diff -Nurwd orig/lustre-1.6.2/ldiskfs/ldiskfs/autoMakefile.in lustre-1.6.2/ldiskfs/ldiskfs/autoMakefile.in
+--- orig/lustre-1.6.2/ldiskfs/ldiskfs/autoMakefile.in 2007-08-30 00:30:06.000000000 +0200
++++ lustre-1.6.2/ldiskfs/ldiskfs/autoMakefile.in 2007-09-14 13:58:39.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -52651,9 +52401,91 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lnet/autoMakefile.in lustre-1.6.2/lnet/autoMakefile.in
---- lustre-1.6.2~/lnet/autoMakefile.in 2007-08-30 00:29:50.000000000 +0200
-+++ lustre-1.6.2/lnet/autoMakefile.in 2007-09-06 14:19:05.899909960 +0200
+diff -Nurwd orig/lustre-1.6.2/lnet/autoconf/Makefile.in lustre-1.6.2/lnet/autoconf/Makefile.in
+--- orig/lustre-1.6.2/lnet/autoconf/Makefile.in 2007-08-30 00:29:50.000000000 +0200
++++ lustre-1.6.2/lnet/autoconf/Makefile.in 2007-09-14 13:58:30.000000000 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.7.8 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+
+ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+@@ -112,12 +112,11 @@
+ EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
+ EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
+ EXTRA_KCFLAGS = @EXTRA_KCFLAGS@
+-EXTRA_KLDFLAGS = @EXTRA_KLDFLAGS@
+-EXTRA_KLIBS = @EXTRA_KLIBS@
+ EXTRA_LNET_INCLUDE = @EXTRA_LNET_INCLUDE@
+ GMCPPFLAGS = @GMCPPFLAGS@
+ GMLIBS = @GMLIBS@
+ GMLND = @GMLND@
++GREP = @GREP@
+ IIBCPPFLAGS = @IIBCPPFLAGS@
+ IIBLND = @IIBLND@
+ INCLUDE_RULES = @INCLUDE_RULES@
+@@ -213,8 +212,6 @@
+ VIBLND = @VIBLND@
+ ac_configure_args = @ac_configure_args@
+ ac_ct_CC = @ac_ct_CC@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ agentdir = @agentdir@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+@@ -228,34 +225,37 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ demodir = @demodir@
+ docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-kextdir = @kextdir@
+ lb_target_os = @lb_target_os@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+ linux25 = @linux25@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+-macosdir = @macosdir@
+ mandir = @mandir@
+ mibdir = @mibdir@
+ moduledir = @moduledir@
+ modulefsdir = @modulefsdir@
+ modulenetdir = @modulenetdir@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pkgexampledir = @pkgexampledir@
+-plistdir = @plistdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ rootsbindir = @rootsbindir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+@@ -337,7 +337,7 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- INSTALL_STRIP_FLAG=-s \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ mostlyclean-generic:
+diff -Nurwd orig/lustre-1.6.2/lnet/autoMakefile.in lustre-1.6.2/lnet/autoMakefile.in
+--- orig/lustre-1.6.2/lnet/autoMakefile.in 2007-08-30 00:29:50.000000000 +0200
++++ lustre-1.6.2/lnet/autoMakefile.in 2007-09-14 13:58:30.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -52733,9 +52565,255 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lnet/autoconf/Makefile.in lustre-1.6.2/lnet/autoconf/Makefile.in
---- lustre-1.6.2~/lnet/autoconf/Makefile.in 2007-08-30 00:29:50.000000000 +0200
-+++ lustre-1.6.2/lnet/autoconf/Makefile.in 2007-09-06 14:19:05.961900503 +0200
+diff -Nurwd orig/lustre-1.6.2/lnet/doc/Makefile.in lustre-1.6.2/lnet/doc/Makefile.in
+--- orig/lustre-1.6.2/lnet/doc/Makefile.in 2007-08-30 00:29:51.000000000 +0200
++++ lustre-1.6.2/lnet/doc/Makefile.in 2007-09-14 13:58:30.000000000 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.7.8 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+
+ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+@@ -117,12 +117,11 @@
+ EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
+ EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
+ EXTRA_KCFLAGS = @EXTRA_KCFLAGS@
+-EXTRA_KLDFLAGS = @EXTRA_KLDFLAGS@
+-EXTRA_KLIBS = @EXTRA_KLIBS@
+ EXTRA_LNET_INCLUDE = @EXTRA_LNET_INCLUDE@
+ GMCPPFLAGS = @GMCPPFLAGS@
+ GMLIBS = @GMLIBS@
+ GMLND = @GMLND@
++GREP = @GREP@
+ IIBCPPFLAGS = @IIBCPPFLAGS@
+ IIBLND = @IIBLND@
+ INCLUDE_RULES = @INCLUDE_RULES@
+@@ -218,8 +217,6 @@
+ VIBLND = @VIBLND@
+ ac_configure_args = @ac_configure_args@
+ ac_ct_CC = @ac_ct_CC@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ agentdir = @agentdir@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+@@ -233,34 +230,37 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ demodir = @demodir@
+ docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-kextdir = @kextdir@
+ lb_target_os = @lb_target_os@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+ linux25 = @linux25@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+-macosdir = @macosdir@
+ mandir = @mandir@
+ mibdir = @mibdir@
+ moduledir = @moduledir@
+ modulefsdir = @modulefsdir@
+ modulenetdir = @modulenetdir@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pkgexampledir = @pkgexampledir@
+-plistdir = @plistdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ rootsbindir = @rootsbindir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+@@ -362,7 +362,7 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- INSTALL_STRIP_FLAG=-s \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ mostlyclean-generic:
+diff -Nurwd orig/lustre-1.6.2/lnet/include/libcfs/linux/Makefile.in lustre-1.6.2/lnet/include/libcfs/linux/Makefile.in
+--- orig/lustre-1.6.2/lnet/include/libcfs/linux/Makefile.in 2007-08-30 00:29:51.000000000 +0200
++++ lustre-1.6.2/lnet/include/libcfs/linux/Makefile.in 2007-09-14 13:58:30.000000000 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.7.8 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+
+ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+@@ -112,12 +112,11 @@
+ EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
+ EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
+ EXTRA_KCFLAGS = @EXTRA_KCFLAGS@
+-EXTRA_KLDFLAGS = @EXTRA_KLDFLAGS@
+-EXTRA_KLIBS = @EXTRA_KLIBS@
+ EXTRA_LNET_INCLUDE = @EXTRA_LNET_INCLUDE@
+ GMCPPFLAGS = @GMCPPFLAGS@
+ GMLIBS = @GMLIBS@
+ GMLND = @GMLND@
++GREP = @GREP@
+ IIBCPPFLAGS = @IIBCPPFLAGS@
+ IIBLND = @IIBLND@
+ INCLUDE_RULES = @INCLUDE_RULES@
+@@ -213,8 +212,6 @@
+ VIBLND = @VIBLND@
+ ac_configure_args = @ac_configure_args@
+ ac_ct_CC = @ac_ct_CC@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ agentdir = @agentdir@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+@@ -228,34 +225,37 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ demodir = @demodir@
+ docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-kextdir = @kextdir@
+ lb_target_os = @lb_target_os@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+ linux25 = @linux25@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+-macosdir = @macosdir@
+ mandir = @mandir@
+ mibdir = @mibdir@
+ moduledir = @moduledir@
+ modulefsdir = @modulefsdir@
+ modulenetdir = @modulenetdir@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pkgexampledir = @pkgexampledir@
+-plistdir = @plistdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ rootsbindir = @rootsbindir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+@@ -340,7 +340,7 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- INSTALL_STRIP_FLAG=-s \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ mostlyclean-generic:
+diff -Nurwd orig/lustre-1.6.2/lnet/include/libcfs/Makefile.in lustre-1.6.2/lnet/include/libcfs/Makefile.in
+--- orig/lustre-1.6.2/lnet/include/libcfs/Makefile.in 2007-08-30 00:29:51.000000000 +0200
++++ lustre-1.6.2/lnet/include/libcfs/Makefile.in 2007-09-14 13:58:30.000000000 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.7.8 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+
+ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+@@ -113,12 +113,11 @@
+ EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
+ EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
+ EXTRA_KCFLAGS = @EXTRA_KCFLAGS@
+-EXTRA_KLDFLAGS = @EXTRA_KLDFLAGS@
+-EXTRA_KLIBS = @EXTRA_KLIBS@
+ EXTRA_LNET_INCLUDE = @EXTRA_LNET_INCLUDE@
+ GMCPPFLAGS = @GMCPPFLAGS@
+ GMLIBS = @GMLIBS@
+ GMLND = @GMLND@
++GREP = @GREP@
+ IIBCPPFLAGS = @IIBCPPFLAGS@
+ IIBLND = @IIBLND@
+ INCLUDE_RULES = @INCLUDE_RULES@
+@@ -214,8 +213,6 @@
+ VIBLND = @VIBLND@
+ ac_configure_args = @ac_configure_args@
+ ac_ct_CC = @ac_ct_CC@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ agentdir = @agentdir@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+@@ -229,34 +226,37 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ demodir = @demodir@
+ docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-kextdir = @kextdir@
+ lb_target_os = @lb_target_os@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+ linux25 = @linux25@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+-macosdir = @macosdir@
+ mandir = @mandir@
+ mibdir = @mibdir@
+ moduledir = @moduledir@
+ modulefsdir = @modulefsdir@
+ modulenetdir = @modulenetdir@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pkgexampledir = @pkgexampledir@
+-plistdir = @plistdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ rootsbindir = @rootsbindir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+@@ -481,7 +481,7 @@
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- INSTALL_STRIP_FLAG=-s \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ mostlyclean-generic:
+diff -Nurwd orig/lustre-1.6.2/lnet/include/lnet/linux/Makefile.in lustre-1.6.2/lnet/include/lnet/linux/Makefile.in
+--- orig/lustre-1.6.2/lnet/include/lnet/linux/Makefile.in 2007-08-30 00:29:51.000000000 +0200
++++ lustre-1.6.2/lnet/include/lnet/linux/Makefile.in 2007-09-14 13:58:30.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.8 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
@@ -52815,16 +52893,16 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lnet/doc/Makefile.in lustre-1.6.2/lnet/doc/Makefile.in
---- lustre-1.6.2~/lnet/doc/Makefile.in 2007-08-30 00:29:51.000000000 +0200
-+++ lustre-1.6.2/lnet/doc/Makefile.in 2007-09-06 14:19:06.033889520 +0200
+diff -Nurwd orig/lustre-1.6.2/lnet/include/lnet/Makefile.in lustre-1.6.2/lnet/include/lnet/Makefile.in
+--- orig/lustre-1.6.2/lnet/include/lnet/Makefile.in 2007-08-30 00:29:51.000000000 +0200
++++ lustre-1.6.2/lnet/include/lnet/Makefile.in 2007-09-14 13:58:30.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.8 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-@@ -117,12 +117,11 @@
+@@ -113,12 +113,11 @@
EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
EXTRA_KCFLAGS = @EXTRA_KCFLAGS@
@@ -52838,7 +52916,7 @@
IIBCPPFLAGS = @IIBCPPFLAGS@
IIBLND = @IIBLND@
INCLUDE_RULES = @INCLUDE_RULES@
-@@ -218,8 +217,6 @@
+@@ -214,8 +213,6 @@
VIBLND = @VIBLND@
ac_configure_args = @ac_configure_args@
ac_ct_CC = @ac_ct_CC@
@@ -52847,7 +52925,7 @@
agentdir = @agentdir@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -233,34 +230,37 @@
+@@ -229,34 +226,37 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
@@ -52888,8 +52966,8 @@
rootsbindir = @rootsbindir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
-@@ -362,7 +362,7 @@
- installcheck: installcheck-am
+@@ -484,7 +484,7 @@
+ installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
@@ -52897,9 +52975,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lnet/include/Makefile.in lustre-1.6.2/lnet/include/Makefile.in
---- lustre-1.6.2~/lnet/include/Makefile.in 2007-08-30 00:29:51.000000000 +0200
-+++ lustre-1.6.2/lnet/include/Makefile.in 2007-09-06 14:19:06.098879606 +0200
+diff -Nurwd orig/lustre-1.6.2/lnet/include/Makefile.in lustre-1.6.2/lnet/include/Makefile.in
+--- orig/lustre-1.6.2/lnet/include/Makefile.in 2007-08-30 00:29:51.000000000 +0200
++++ lustre-1.6.2/lnet/include/Makefile.in 2007-09-14 13:58:30.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.8 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
@@ -52979,337 +53057,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lnet/include/libcfs/Makefile.in lustre-1.6.2/lnet/include/libcfs/Makefile.in
---- lustre-1.6.2~/lnet/include/libcfs/Makefile.in 2007-08-30 00:29:51.000000000 +0200
-+++ lustre-1.6.2/lnet/include/libcfs/Makefile.in 2007-09-06 14:19:06.175867860 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.7.8 from Makefile.am.
-+# Makefile.in generated by automake 1.7.9 from Makefile.am.
- # @configure_input@
-
- # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-@@ -113,12 +113,11 @@
- EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
- EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
- EXTRA_KCFLAGS = @EXTRA_KCFLAGS@
--EXTRA_KLDFLAGS = @EXTRA_KLDFLAGS@
--EXTRA_KLIBS = @EXTRA_KLIBS@
- EXTRA_LNET_INCLUDE = @EXTRA_LNET_INCLUDE@
- GMCPPFLAGS = @GMCPPFLAGS@
- GMLIBS = @GMLIBS@
- GMLND = @GMLND@
-+GREP = @GREP@
- IIBCPPFLAGS = @IIBCPPFLAGS@
- IIBLND = @IIBLND@
- INCLUDE_RULES = @INCLUDE_RULES@
-@@ -214,8 +213,6 @@
- VIBLND = @VIBLND@
- ac_configure_args = @ac_configure_args@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- agentdir = @agentdir@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -229,34 +226,37 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- demodir = @demodir@
- docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
--kextdir = @kextdir@
- lb_target_os = @lb_target_os@
- libdir = @libdir@
- libexecdir = @libexecdir@
- linux25 = @linux25@
-+localedir = @localedir@
- localstatedir = @localstatedir@
--macosdir = @macosdir@
- mandir = @mandir@
- mibdir = @mibdir@
- moduledir = @moduledir@
- modulefsdir = @modulefsdir@
- modulenetdir = @modulenetdir@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pkgexampledir = @pkgexampledir@
--plistdir = @plistdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- rootsbindir = @rootsbindir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-@@ -481,7 +481,7 @@
- installcheck: installcheck-recursive
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-- INSTALL_STRIP_FLAG=-s \
-+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lnet/include/libcfs/linux/Makefile.in lustre-1.6.2/lnet/include/libcfs/linux/Makefile.in
---- lustre-1.6.2~/lnet/include/libcfs/linux/Makefile.in 2007-08-30 00:29:51.000000000 +0200
-+++ lustre-1.6.2/lnet/include/libcfs/linux/Makefile.in 2007-09-06 14:19:06.238858251 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.7.8 from Makefile.am.
-+# Makefile.in generated by automake 1.7.9 from Makefile.am.
- # @configure_input@
-
- # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-@@ -112,12 +112,11 @@
- EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
- EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
- EXTRA_KCFLAGS = @EXTRA_KCFLAGS@
--EXTRA_KLDFLAGS = @EXTRA_KLDFLAGS@
--EXTRA_KLIBS = @EXTRA_KLIBS@
- EXTRA_LNET_INCLUDE = @EXTRA_LNET_INCLUDE@
- GMCPPFLAGS = @GMCPPFLAGS@
- GMLIBS = @GMLIBS@
- GMLND = @GMLND@
-+GREP = @GREP@
- IIBCPPFLAGS = @IIBCPPFLAGS@
- IIBLND = @IIBLND@
- INCLUDE_RULES = @INCLUDE_RULES@
-@@ -213,8 +212,6 @@
- VIBLND = @VIBLND@
- ac_configure_args = @ac_configure_args@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- agentdir = @agentdir@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -228,34 +225,37 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- demodir = @demodir@
- docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
--kextdir = @kextdir@
- lb_target_os = @lb_target_os@
- libdir = @libdir@
- libexecdir = @libexecdir@
- linux25 = @linux25@
-+localedir = @localedir@
- localstatedir = @localstatedir@
--macosdir = @macosdir@
- mandir = @mandir@
- mibdir = @mibdir@
- moduledir = @moduledir@
- modulefsdir = @modulefsdir@
- modulenetdir = @modulenetdir@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pkgexampledir = @pkgexampledir@
--plistdir = @plistdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- rootsbindir = @rootsbindir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-@@ -340,7 +340,7 @@
- installcheck: installcheck-am
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-- INSTALL_STRIP_FLAG=-s \
-+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lnet/include/lnet/Makefile.in lustre-1.6.2/lnet/include/lnet/Makefile.in
---- lustre-1.6.2~/lnet/include/lnet/Makefile.in 2007-08-30 00:29:51.000000000 +0200
-+++ lustre-1.6.2/lnet/include/lnet/Makefile.in 2007-09-06 14:19:06.309847421 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.7.8 from Makefile.am.
-+# Makefile.in generated by automake 1.7.9 from Makefile.am.
- # @configure_input@
-
- # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-@@ -113,12 +113,11 @@
- EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
- EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
- EXTRA_KCFLAGS = @EXTRA_KCFLAGS@
--EXTRA_KLDFLAGS = @EXTRA_KLDFLAGS@
--EXTRA_KLIBS = @EXTRA_KLIBS@
- EXTRA_LNET_INCLUDE = @EXTRA_LNET_INCLUDE@
- GMCPPFLAGS = @GMCPPFLAGS@
- GMLIBS = @GMLIBS@
- GMLND = @GMLND@
-+GREP = @GREP@
- IIBCPPFLAGS = @IIBCPPFLAGS@
- IIBLND = @IIBLND@
- INCLUDE_RULES = @INCLUDE_RULES@
-@@ -214,8 +213,6 @@
- VIBLND = @VIBLND@
- ac_configure_args = @ac_configure_args@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- agentdir = @agentdir@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -229,34 +226,37 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- demodir = @demodir@
- docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
--kextdir = @kextdir@
- lb_target_os = @lb_target_os@
- libdir = @libdir@
- libexecdir = @libexecdir@
- linux25 = @linux25@
-+localedir = @localedir@
- localstatedir = @localstatedir@
--macosdir = @macosdir@
- mandir = @mandir@
- mibdir = @mibdir@
- moduledir = @moduledir@
- modulefsdir = @modulefsdir@
- modulenetdir = @modulenetdir@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pkgexampledir = @pkgexampledir@
--plistdir = @plistdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- rootsbindir = @rootsbindir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-@@ -484,7 +484,7 @@
- installcheck: installcheck-recursive
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-- INSTALL_STRIP_FLAG=-s \
-+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lnet/include/lnet/linux/Makefile.in lustre-1.6.2/lnet/include/lnet/linux/Makefile.in
---- lustre-1.6.2~/lnet/include/lnet/linux/Makefile.in 2007-08-30 00:29:51.000000000 +0200
-+++ lustre-1.6.2/lnet/include/lnet/linux/Makefile.in 2007-09-06 14:19:06.368838422 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.7.8 from Makefile.am.
-+# Makefile.in generated by automake 1.7.9 from Makefile.am.
- # @configure_input@
-
- # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-@@ -112,12 +112,11 @@
- EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
- EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
- EXTRA_KCFLAGS = @EXTRA_KCFLAGS@
--EXTRA_KLDFLAGS = @EXTRA_KLDFLAGS@
--EXTRA_KLIBS = @EXTRA_KLIBS@
- EXTRA_LNET_INCLUDE = @EXTRA_LNET_INCLUDE@
- GMCPPFLAGS = @GMCPPFLAGS@
- GMLIBS = @GMLIBS@
- GMLND = @GMLND@
-+GREP = @GREP@
- IIBCPPFLAGS = @IIBCPPFLAGS@
- IIBLND = @IIBLND@
- INCLUDE_RULES = @INCLUDE_RULES@
-@@ -213,8 +212,6 @@
- VIBLND = @VIBLND@
- ac_configure_args = @ac_configure_args@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- agentdir = @agentdir@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -228,34 +225,37 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- demodir = @demodir@
- docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
--kextdir = @kextdir@
- lb_target_os = @lb_target_os@
- libdir = @libdir@
- libexecdir = @libexecdir@
- linux25 = @linux25@
-+localedir = @localedir@
- localstatedir = @localstatedir@
--macosdir = @macosdir@
- mandir = @mandir@
- mibdir = @mibdir@
- moduledir = @moduledir@
- modulefsdir = @modulefsdir@
- modulenetdir = @modulenetdir@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pkgexampledir = @pkgexampledir@
--plistdir = @plistdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- rootsbindir = @rootsbindir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-@@ -337,7 +337,7 @@
- installcheck: installcheck-am
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-- INSTALL_STRIP_FLAG=-s \
-+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lnet/klnds/autoMakefile.in lustre-1.6.2/lnet/klnds/autoMakefile.in
---- lustre-1.6.2~/lnet/klnds/autoMakefile.in 2007-08-30 00:29:51.000000000 +0200
-+++ lustre-1.6.2/lnet/klnds/autoMakefile.in 2007-09-06 14:19:06.439827592 +0200
+diff -Nurwd orig/lustre-1.6.2/lnet/klnds/autoMakefile.in lustre-1.6.2/lnet/klnds/autoMakefile.in
+--- orig/lustre-1.6.2/lnet/klnds/autoMakefile.in 2007-08-30 00:29:51.000000000 +0200
++++ lustre-1.6.2/lnet/klnds/autoMakefile.in 2007-09-14 13:58:31.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -53389,9 +53139,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lnet/klnds/ciblnd/autoMakefile.in lustre-1.6.2/lnet/klnds/ciblnd/autoMakefile.in
---- lustre-1.6.2~/lnet/klnds/ciblnd/autoMakefile.in 2007-08-30 00:29:51.000000000 +0200
-+++ lustre-1.6.2/lnet/klnds/ciblnd/autoMakefile.in 2007-09-06 14:19:06.509816914 +0200
+diff -Nurwd orig/lustre-1.6.2/lnet/klnds/ciblnd/autoMakefile.in lustre-1.6.2/lnet/klnds/ciblnd/autoMakefile.in
+--- orig/lustre-1.6.2/lnet/klnds/ciblnd/autoMakefile.in 2007-08-30 00:29:51.000000000 +0200
++++ lustre-1.6.2/lnet/klnds/ciblnd/autoMakefile.in 2007-09-14 13:58:31.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -53471,9 +53221,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lnet/klnds/gmlnd/autoMakefile.in lustre-1.6.2/lnet/klnds/gmlnd/autoMakefile.in
---- lustre-1.6.2~/lnet/klnds/gmlnd/autoMakefile.in 2007-08-30 00:29:52.000000000 +0200
-+++ lustre-1.6.2/lnet/klnds/gmlnd/autoMakefile.in 2007-09-06 14:19:06.585805322 +0200
+diff -Nurwd orig/lustre-1.6.2/lnet/klnds/gmlnd/autoMakefile.in lustre-1.6.2/lnet/klnds/gmlnd/autoMakefile.in
+--- orig/lustre-1.6.2/lnet/klnds/gmlnd/autoMakefile.in 2007-08-30 00:29:52.000000000 +0200
++++ lustre-1.6.2/lnet/klnds/gmlnd/autoMakefile.in 2007-09-14 13:58:31.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -53553,9 +53303,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lnet/klnds/iiblnd/autoMakefile.in lustre-1.6.2/lnet/klnds/iiblnd/autoMakefile.in
---- lustre-1.6.2~/lnet/klnds/iiblnd/autoMakefile.in 2007-08-30 00:29:52.000000000 +0200
-+++ lustre-1.6.2/lnet/klnds/iiblnd/autoMakefile.in 2007-09-06 14:19:06.653794950 +0200
+diff -Nurwd orig/lustre-1.6.2/lnet/klnds/iiblnd/autoMakefile.in lustre-1.6.2/lnet/klnds/iiblnd/autoMakefile.in
+--- orig/lustre-1.6.2/lnet/klnds/iiblnd/autoMakefile.in 2007-08-30 00:29:52.000000000 +0200
++++ lustre-1.6.2/lnet/klnds/iiblnd/autoMakefile.in 2007-09-14 13:58:31.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -53635,9 +53385,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lnet/klnds/mxlnd/autoMakefile.in lustre-1.6.2/lnet/klnds/mxlnd/autoMakefile.in
---- lustre-1.6.2~/lnet/klnds/mxlnd/autoMakefile.in 2007-08-30 00:29:52.000000000 +0200
-+++ lustre-1.6.2/lnet/klnds/mxlnd/autoMakefile.in 2007-09-06 14:19:06.719784883 +0200
+diff -Nurwd orig/lustre-1.6.2/lnet/klnds/mxlnd/autoMakefile.in lustre-1.6.2/lnet/klnds/mxlnd/autoMakefile.in
+--- orig/lustre-1.6.2/lnet/klnds/mxlnd/autoMakefile.in 2007-08-30 00:29:52.000000000 +0200
++++ lustre-1.6.2/lnet/klnds/mxlnd/autoMakefile.in 2007-09-14 13:58:31.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -53717,9 +53467,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lnet/klnds/o2iblnd/autoMakefile.in lustre-1.6.2/lnet/klnds/o2iblnd/autoMakefile.in
---- lustre-1.6.2~/lnet/klnds/o2iblnd/autoMakefile.in 2007-08-30 00:29:52.000000000 +0200
-+++ lustre-1.6.2/lnet/klnds/o2iblnd/autoMakefile.in 2007-09-06 14:19:06.789774205 +0200
+diff -Nurwd orig/lustre-1.6.2/lnet/klnds/o2iblnd/autoMakefile.in lustre-1.6.2/lnet/klnds/o2iblnd/autoMakefile.in
+--- orig/lustre-1.6.2/lnet/klnds/o2iblnd/autoMakefile.in 2007-08-30 00:29:52.000000000 +0200
++++ lustre-1.6.2/lnet/klnds/o2iblnd/autoMakefile.in 2007-09-14 13:58:31.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -53799,9 +53549,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lnet/klnds/openiblnd/autoMakefile.in lustre-1.6.2/lnet/klnds/openiblnd/autoMakefile.in
---- lustre-1.6.2~/lnet/klnds/openiblnd/autoMakefile.in 2007-08-30 00:29:52.000000000 +0200
-+++ lustre-1.6.2/lnet/klnds/openiblnd/autoMakefile.in 2007-09-06 14:19:06.858763680 +0200
+diff -Nurwd orig/lustre-1.6.2/lnet/klnds/openiblnd/autoMakefile.in lustre-1.6.2/lnet/klnds/openiblnd/autoMakefile.in
+--- orig/lustre-1.6.2/lnet/klnds/openiblnd/autoMakefile.in 2007-08-30 00:29:52.000000000 +0200
++++ lustre-1.6.2/lnet/klnds/openiblnd/autoMakefile.in 2007-09-14 13:58:31.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -53881,9 +53631,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lnet/klnds/ptllnd/autoMakefile.in lustre-1.6.2/lnet/klnds/ptllnd/autoMakefile.in
---- lustre-1.6.2~/lnet/klnds/ptllnd/autoMakefile.in 2007-08-30 00:29:52.000000000 +0200
-+++ lustre-1.6.2/lnet/klnds/ptllnd/autoMakefile.in 2007-09-06 14:19:06.926753308 +0200
+diff -Nurwd orig/lustre-1.6.2/lnet/klnds/ptllnd/autoMakefile.in lustre-1.6.2/lnet/klnds/ptllnd/autoMakefile.in
+--- orig/lustre-1.6.2/lnet/klnds/ptllnd/autoMakefile.in 2007-08-30 00:29:52.000000000 +0200
++++ lustre-1.6.2/lnet/klnds/ptllnd/autoMakefile.in 2007-09-14 13:58:31.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -53963,9 +53713,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lnet/klnds/qswlnd/autoMakefile.in lustre-1.6.2/lnet/klnds/qswlnd/autoMakefile.in
---- lustre-1.6.2~/lnet/klnds/qswlnd/autoMakefile.in 2007-08-30 00:29:52.000000000 +0200
-+++ lustre-1.6.2/lnet/klnds/qswlnd/autoMakefile.in 2007-09-06 14:19:06.989743699 +0200
+diff -Nurwd orig/lustre-1.6.2/lnet/klnds/qswlnd/autoMakefile.in lustre-1.6.2/lnet/klnds/qswlnd/autoMakefile.in
+--- orig/lustre-1.6.2/lnet/klnds/qswlnd/autoMakefile.in 2007-08-30 00:29:52.000000000 +0200
++++ lustre-1.6.2/lnet/klnds/qswlnd/autoMakefile.in 2007-09-14 13:58:31.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -54045,9 +53795,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lnet/klnds/ralnd/autoMakefile.in lustre-1.6.2/lnet/klnds/ralnd/autoMakefile.in
---- lustre-1.6.2~/lnet/klnds/ralnd/autoMakefile.in 2007-08-30 00:29:52.000000000 +0200
-+++ lustre-1.6.2/lnet/klnds/ralnd/autoMakefile.in 2007-09-06 14:19:07.059733021 +0200
+diff -Nurwd orig/lustre-1.6.2/lnet/klnds/ralnd/autoMakefile.in lustre-1.6.2/lnet/klnds/ralnd/autoMakefile.in
+--- orig/lustre-1.6.2/lnet/klnds/ralnd/autoMakefile.in 2007-08-30 00:29:52.000000000 +0200
++++ lustre-1.6.2/lnet/klnds/ralnd/autoMakefile.in 2007-09-14 13:58:31.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -54127,9 +53877,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lnet/klnds/socklnd/autoMakefile.in lustre-1.6.2/lnet/klnds/socklnd/autoMakefile.in
---- lustre-1.6.2~/lnet/klnds/socklnd/autoMakefile.in 2007-08-30 00:29:52.000000000 +0200
-+++ lustre-1.6.2/lnet/klnds/socklnd/autoMakefile.in 2007-09-06 14:19:07.135721429 +0200
+diff -Nurwd orig/lustre-1.6.2/lnet/klnds/socklnd/autoMakefile.in lustre-1.6.2/lnet/klnds/socklnd/autoMakefile.in
+--- orig/lustre-1.6.2/lnet/klnds/socklnd/autoMakefile.in 2007-08-30 00:29:52.000000000 +0200
++++ lustre-1.6.2/lnet/klnds/socklnd/autoMakefile.in 2007-09-14 13:58:31.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -54571,9 +54321,9 @@
install-data-hook: $(install_data_hook)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
-diff -urNad lustre-1.6.2~/lnet/klnds/viblnd/autoMakefile.in lustre-1.6.2/lnet/klnds/viblnd/autoMakefile.in
---- lustre-1.6.2~/lnet/klnds/viblnd/autoMakefile.in 2007-08-30 00:29:52.000000000 +0200
-+++ lustre-1.6.2/lnet/klnds/viblnd/autoMakefile.in 2007-09-06 14:19:07.209710141 +0200
+diff -Nurwd orig/lustre-1.6.2/lnet/klnds/viblnd/autoMakefile.in lustre-1.6.2/lnet/klnds/viblnd/autoMakefile.in
+--- orig/lustre-1.6.2/lnet/klnds/viblnd/autoMakefile.in 2007-08-30 00:29:52.000000000 +0200
++++ lustre-1.6.2/lnet/klnds/viblnd/autoMakefile.in 2007-09-14 13:58:31.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -54653,9 +54403,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lnet/libcfs/autoMakefile.in lustre-1.6.2/lnet/libcfs/autoMakefile.in
---- lustre-1.6.2~/lnet/libcfs/autoMakefile.in 2007-08-30 00:29:53.000000000 +0200
-+++ lustre-1.6.2/lnet/libcfs/autoMakefile.in 2007-09-06 14:19:07.329691837 +0200
+diff -Nurwd orig/lustre-1.6.2/lnet/libcfs/autoMakefile.in lustre-1.6.2/lnet/libcfs/autoMakefile.in
+--- orig/lustre-1.6.2/lnet/libcfs/autoMakefile.in 2007-08-30 00:29:53.000000000 +0200
++++ lustre-1.6.2/lnet/libcfs/autoMakefile.in 2007-09-14 13:58:32.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -55330,9 +55080,9 @@
install-data-hook: $(install_data_hook)
-diff -urNad lustre-1.6.2~/lnet/libcfs/linux/Makefile.in lustre-1.6.2/lnet/libcfs/linux/Makefile.in
---- lustre-1.6.2~/lnet/libcfs/linux/Makefile.in 2007-08-30 00:29:53.000000000 +0200
-+++ lustre-1.6.2/lnet/libcfs/linux/Makefile.in 2007-09-06 14:19:07.389682685 +0200
+diff -Nurwd orig/lustre-1.6.2/lnet/libcfs/linux/Makefile.in lustre-1.6.2/lnet/libcfs/linux/Makefile.in
+--- orig/lustre-1.6.2/lnet/libcfs/linux/Makefile.in 2007-08-30 00:29:53.000000000 +0200
++++ lustre-1.6.2/lnet/libcfs/linux/Makefile.in 2007-09-14 13:58:32.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.8 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
@@ -55412,9 +55162,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lnet/lnet/autoMakefile.in lustre-1.6.2/lnet/lnet/autoMakefile.in
---- lustre-1.6.2~/lnet/lnet/autoMakefile.in 2007-08-30 00:29:53.000000000 +0200
-+++ lustre-1.6.2/lnet/lnet/autoMakefile.in 2007-09-06 14:19:07.560656602 +0200
+diff -Nurwd orig/lustre-1.6.2/lnet/lnet/autoMakefile.in lustre-1.6.2/lnet/lnet/autoMakefile.in
+--- orig/lustre-1.6.2/lnet/lnet/autoMakefile.in 2007-08-30 00:29:53.000000000 +0200
++++ lustre-1.6.2/lnet/lnet/autoMakefile.in 2007-09-14 13:58:32.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -56018,9 +55768,9 @@
install-data-hook: $(install_data_hook)
-diff -urNad lustre-1.6.2~/lnet/selftest/autoMakefile.in lustre-1.6.2/lnet/selftest/autoMakefile.in
---- lustre-1.6.2~/lnet/selftest/autoMakefile.in 2007-08-30 00:29:53.000000000 +0200
-+++ lustre-1.6.2/lnet/selftest/autoMakefile.in 2007-09-06 14:19:07.704634638 +0200
+diff -Nurwd orig/lustre-1.6.2/lnet/selftest/autoMakefile.in lustre-1.6.2/lnet/selftest/autoMakefile.in
+--- orig/lustre-1.6.2/lnet/selftest/autoMakefile.in 2007-08-30 00:29:53.000000000 +0200
++++ lustre-1.6.2/lnet/selftest/autoMakefile.in 2007-09-14 13:58:32.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -56100,9 +55850,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lnet/ulnds/autoMakefile.in lustre-1.6.2/lnet/ulnds/autoMakefile.in
---- lustre-1.6.2~/lnet/ulnds/autoMakefile.in 2007-08-30 00:29:54.000000000 +0200
-+++ lustre-1.6.2/lnet/ulnds/autoMakefile.in 2007-09-06 14:19:07.780623045 +0200
+diff -Nurwd orig/lustre-1.6.2/lnet/ulnds/autoMakefile.in lustre-1.6.2/lnet/ulnds/autoMakefile.in
+--- orig/lustre-1.6.2/lnet/ulnds/autoMakefile.in 2007-08-30 00:29:54.000000000 +0200
++++ lustre-1.6.2/lnet/ulnds/autoMakefile.in 2007-09-14 13:58:32.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -56182,9 +55932,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lnet/ulnds/ptllnd/Makefile.in lustre-1.6.2/lnet/ulnds/ptllnd/Makefile.in
---- lustre-1.6.2~/lnet/ulnds/ptllnd/Makefile.in 2007-08-30 00:29:54.000000000 +0200
-+++ lustre-1.6.2/lnet/ulnds/ptllnd/Makefile.in 2007-09-06 14:19:07.880607792 +0200
+diff -Nurwd orig/lustre-1.6.2/lnet/ulnds/ptllnd/Makefile.in lustre-1.6.2/lnet/ulnds/ptllnd/Makefile.in
+--- orig/lustre-1.6.2/lnet/ulnds/ptllnd/Makefile.in 2007-08-30 00:29:54.000000000 +0200
++++ lustre-1.6.2/lnet/ulnds/ptllnd/Makefile.in 2007-09-14 13:58:32.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.8 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
@@ -56264,9 +56014,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lnet/ulnds/socklnd/Makefile.in lustre-1.6.2/lnet/ulnds/socklnd/Makefile.in
---- lustre-1.6.2~/lnet/ulnds/socklnd/Makefile.in 2007-08-30 00:29:54.000000000 +0200
-+++ lustre-1.6.2/lnet/ulnds/socklnd/Makefile.in 2007-09-06 14:19:08.020586437 +0200
+diff -Nurwd orig/lustre-1.6.2/lnet/ulnds/socklnd/Makefile.in lustre-1.6.2/lnet/ulnds/socklnd/Makefile.in
+--- orig/lustre-1.6.2/lnet/ulnds/socklnd/Makefile.in 2007-08-30 00:29:54.000000000 +0200
++++ lustre-1.6.2/lnet/ulnds/socklnd/Makefile.in 2007-09-14 13:58:32.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.8 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
@@ -56346,9 +56096,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lnet/utils/Makefile.in lustre-1.6.2/lnet/utils/Makefile.in
---- lustre-1.6.2~/lnet/utils/Makefile.in 2007-08-30 00:29:54.000000000 +0200
-+++ lustre-1.6.2/lnet/utils/Makefile.in 2007-09-06 14:19:08.179562184 +0200
+diff -Nurwd orig/lustre-1.6.2/lnet/utils/Makefile.in lustre-1.6.2/lnet/utils/Makefile.in
+--- orig/lustre-1.6.2/lnet/utils/Makefile.in 2007-08-30 00:29:54.000000000 +0200
++++ lustre-1.6.2/lnet/utils/Makefile.in 2007-09-14 13:58:33.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.8 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
@@ -56428,9 +56178,91 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lustre/autoMakefile.in lustre-1.6.2/lustre/autoMakefile.in
---- lustre-1.6.2~/lustre/autoMakefile.in 2007-08-30 00:29:54.000000000 +0200
-+++ lustre-1.6.2/lustre/autoMakefile.in 2007-09-06 14:19:08.259549982 +0200
+diff -Nurwd orig/lustre-1.6.2/lustre/autoconf/Makefile.in lustre-1.6.2/lustre/autoconf/Makefile.in
+--- orig/lustre-1.6.2/lustre/autoconf/Makefile.in 2007-08-30 00:29:54.000000000 +0200
++++ lustre-1.6.2/lustre/autoconf/Makefile.in 2007-09-14 13:58:33.000000000 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.7.8 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+
+ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+@@ -112,12 +112,11 @@
+ EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
+ EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
+ EXTRA_KCFLAGS = @EXTRA_KCFLAGS@
+-EXTRA_KLDFLAGS = @EXTRA_KLDFLAGS@
+-EXTRA_KLIBS = @EXTRA_KLIBS@
+ EXTRA_LNET_INCLUDE = @EXTRA_LNET_INCLUDE@
+ GMCPPFLAGS = @GMCPPFLAGS@
+ GMLIBS = @GMLIBS@
+ GMLND = @GMLND@
++GREP = @GREP@
+ IIBCPPFLAGS = @IIBCPPFLAGS@
+ IIBLND = @IIBLND@
+ INCLUDE_RULES = @INCLUDE_RULES@
+@@ -213,8 +212,6 @@
+ VIBLND = @VIBLND@
+ ac_configure_args = @ac_configure_args@
+ ac_ct_CC = @ac_ct_CC@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ agentdir = @agentdir@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+@@ -228,34 +225,37 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ demodir = @demodir@
+ docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-kextdir = @kextdir@
+ lb_target_os = @lb_target_os@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+ linux25 = @linux25@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+-macosdir = @macosdir@
+ mandir = @mandir@
+ mibdir = @mibdir@
+ moduledir = @moduledir@
+ modulefsdir = @modulefsdir@
+ modulenetdir = @modulenetdir@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pkgexampledir = @pkgexampledir@
+-plistdir = @plistdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ rootsbindir = @rootsbindir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+@@ -337,7 +337,7 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- INSTALL_STRIP_FLAG=-s \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ mostlyclean-generic:
+diff -Nurwd orig/lustre-1.6.2/lustre/autoMakefile.in lustre-1.6.2/lustre/autoMakefile.in
+--- orig/lustre-1.6.2/lustre/autoMakefile.in 2007-08-30 00:29:54.000000000 +0200
++++ lustre-1.6.2/lustre/autoMakefile.in 2007-09-14 13:58:33.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -56510,91 +56342,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lustre/autoconf/Makefile.in lustre-1.6.2/lustre/autoconf/Makefile.in
---- lustre-1.6.2~/lustre/autoconf/Makefile.in 2007-08-30 00:29:54.000000000 +0200
-+++ lustre-1.6.2/lustre/autoconf/Makefile.in 2007-09-06 14:19:08.329539304 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.7.8 from Makefile.am.
-+# Makefile.in generated by automake 1.7.9 from Makefile.am.
- # @configure_input@
-
- # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-@@ -112,12 +112,11 @@
- EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
- EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
- EXTRA_KCFLAGS = @EXTRA_KCFLAGS@
--EXTRA_KLDFLAGS = @EXTRA_KLDFLAGS@
--EXTRA_KLIBS = @EXTRA_KLIBS@
- EXTRA_LNET_INCLUDE = @EXTRA_LNET_INCLUDE@
- GMCPPFLAGS = @GMCPPFLAGS@
- GMLIBS = @GMLIBS@
- GMLND = @GMLND@
-+GREP = @GREP@
- IIBCPPFLAGS = @IIBCPPFLAGS@
- IIBLND = @IIBLND@
- INCLUDE_RULES = @INCLUDE_RULES@
-@@ -213,8 +212,6 @@
- VIBLND = @VIBLND@
- ac_configure_args = @ac_configure_args@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- agentdir = @agentdir@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -228,34 +225,37 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- demodir = @demodir@
- docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
--kextdir = @kextdir@
- lb_target_os = @lb_target_os@
- libdir = @libdir@
- libexecdir = @libexecdir@
- linux25 = @linux25@
-+localedir = @localedir@
- localstatedir = @localstatedir@
--macosdir = @macosdir@
- mandir = @mandir@
- mibdir = @mibdir@
- moduledir = @moduledir@
- modulefsdir = @modulefsdir@
- modulenetdir = @modulenetdir@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pkgexampledir = @pkgexampledir@
--plistdir = @plistdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- rootsbindir = @rootsbindir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-@@ -337,7 +337,7 @@
- installcheck: installcheck-am
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-- INSTALL_STRIP_FLAG=-s \
-+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lustre/contrib/Makefile.in lustre-1.6.2/lustre/contrib/Makefile.in
---- lustre-1.6.2~/lustre/contrib/Makefile.in 2007-08-30 00:29:54.000000000 +0200
-+++ lustre-1.6.2/lustre/contrib/Makefile.in 2007-09-06 14:19:08.404527864 +0200
+diff -Nurwd orig/lustre-1.6.2/lustre/contrib/Makefile.in lustre-1.6.2/lustre/contrib/Makefile.in
+--- orig/lustre-1.6.2/lustre/contrib/Makefile.in 2007-08-30 00:29:54.000000000 +0200
++++ lustre-1.6.2/lustre/contrib/Makefile.in 2007-09-14 13:58:33.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.8 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
@@ -56674,9 +56424,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lustre/doc/Makefile.in lustre-1.6.2/lustre/doc/Makefile.in
---- lustre-1.6.2~/lustre/doc/Makefile.in 2007-08-30 00:29:55.000000000 +0200
-+++ lustre-1.6.2/lustre/doc/Makefile.in 2007-09-06 14:19:08.479516424 +0200
+diff -Nurwd orig/lustre-1.6.2/lustre/doc/Makefile.in lustre-1.6.2/lustre/doc/Makefile.in
+--- orig/lustre-1.6.2/lustre/doc/Makefile.in 2007-08-30 00:29:55.000000000 +0200
++++ lustre-1.6.2/lustre/doc/Makefile.in 2007-09-14 13:58:33.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.8 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
@@ -56756,9 +56506,173 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lustre/include/Makefile.in lustre-1.6.2/lustre/include/Makefile.in
---- lustre-1.6.2~/lustre/include/Makefile.in 2007-08-30 00:29:55.000000000 +0200
-+++ lustre-1.6.2/lustre/include/Makefile.in 2007-09-06 14:19:08.553505137 +0200
+diff -Nurwd orig/lustre-1.6.2/lustre/include/linux/Makefile.in lustre-1.6.2/lustre/include/linux/Makefile.in
+--- orig/lustre-1.6.2/lustre/include/linux/Makefile.in 2007-08-30 00:29:55.000000000 +0200
++++ lustre-1.6.2/lustre/include/linux/Makefile.in 2007-09-14 13:58:33.000000000 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.7.8 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+
+ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+@@ -117,12 +117,11 @@
+ EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
+ EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
+ EXTRA_KCFLAGS = @EXTRA_KCFLAGS@
+-EXTRA_KLDFLAGS = @EXTRA_KLDFLAGS@
+-EXTRA_KLIBS = @EXTRA_KLIBS@
+ EXTRA_LNET_INCLUDE = @EXTRA_LNET_INCLUDE@
+ GMCPPFLAGS = @GMCPPFLAGS@
+ GMLIBS = @GMLIBS@
+ GMLND = @GMLND@
++GREP = @GREP@
+ IIBCPPFLAGS = @IIBCPPFLAGS@
+ IIBLND = @IIBLND@
+ INCLUDE_RULES = @INCLUDE_RULES@
+@@ -218,8 +217,6 @@
+ VIBLND = @VIBLND@
+ ac_configure_args = @ac_configure_args@
+ ac_ct_CC = @ac_ct_CC@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ agentdir = @agentdir@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+@@ -233,34 +230,37 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ demodir = @demodir@
+ docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-kextdir = @kextdir@
+ lb_target_os = @lb_target_os@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+ linux25 = @linux25@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+-macosdir = @macosdir@
+ mandir = @mandir@
+ mibdir = @mibdir@
+ moduledir = @moduledir@
+ modulefsdir = @modulefsdir@
+ modulenetdir = @modulenetdir@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pkgexampledir = @pkgexampledir@
+-plistdir = @plistdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ rootsbindir = @rootsbindir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+@@ -421,7 +421,7 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- INSTALL_STRIP_FLAG=-s \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ mostlyclean-generic:
+diff -Nurwd orig/lustre-1.6.2/lustre/include/lustre/Makefile.in lustre-1.6.2/lustre/include/lustre/Makefile.in
+--- orig/lustre-1.6.2/lustre/include/lustre/Makefile.in 2007-08-30 00:29:55.000000000 +0200
++++ lustre-1.6.2/lustre/include/lustre/Makefile.in 2007-09-14 13:58:33.000000000 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.7.8 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+
+ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+@@ -117,12 +117,11 @@
+ EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
+ EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
+ EXTRA_KCFLAGS = @EXTRA_KCFLAGS@
+-EXTRA_KLDFLAGS = @EXTRA_KLDFLAGS@
+-EXTRA_KLIBS = @EXTRA_KLIBS@
+ EXTRA_LNET_INCLUDE = @EXTRA_LNET_INCLUDE@
+ GMCPPFLAGS = @GMCPPFLAGS@
+ GMLIBS = @GMLIBS@
+ GMLND = @GMLND@
++GREP = @GREP@
+ IIBCPPFLAGS = @IIBCPPFLAGS@
+ IIBLND = @IIBLND@
+ INCLUDE_RULES = @INCLUDE_RULES@
+@@ -218,8 +217,6 @@
+ VIBLND = @VIBLND@
+ ac_configure_args = @ac_configure_args@
+ ac_ct_CC = @ac_ct_CC@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ agentdir = @agentdir@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+@@ -233,34 +230,37 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ demodir = @demodir@
+ docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-kextdir = @kextdir@
+ lb_target_os = @lb_target_os@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+ linux25 = @linux25@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+-macosdir = @macosdir@
+ mandir = @mandir@
+ mibdir = @mibdir@
+ moduledir = @moduledir@
+ modulefsdir = @modulefsdir@
+ modulenetdir = @modulenetdir@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pkgexampledir = @pkgexampledir@
+-plistdir = @plistdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ rootsbindir = @rootsbindir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+@@ -414,7 +414,7 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- INSTALL_STRIP_FLAG=-s \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ mostlyclean-generic:
+diff -Nurwd orig/lustre-1.6.2/lustre/include/Makefile.in lustre-1.6.2/lustre/include/Makefile.in
+--- orig/lustre-1.6.2/lustre/include/Makefile.in 2007-08-30 00:29:55.000000000 +0200
++++ lustre-1.6.2/lustre/include/Makefile.in 2007-09-14 13:58:33.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.8 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
@@ -56838,173 +56752,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lustre/include/linux/Makefile.in lustre-1.6.2/lustre/include/linux/Makefile.in
---- lustre-1.6.2~/lustre/include/linux/Makefile.in 2007-08-30 00:29:55.000000000 +0200
-+++ lustre-1.6.2/lustre/include/linux/Makefile.in 2007-09-06 14:19:08.629493545 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.7.8 from Makefile.am.
-+# Makefile.in generated by automake 1.7.9 from Makefile.am.
- # @configure_input@
-
- # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-@@ -117,12 +117,11 @@
- EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
- EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
- EXTRA_KCFLAGS = @EXTRA_KCFLAGS@
--EXTRA_KLDFLAGS = @EXTRA_KLDFLAGS@
--EXTRA_KLIBS = @EXTRA_KLIBS@
- EXTRA_LNET_INCLUDE = @EXTRA_LNET_INCLUDE@
- GMCPPFLAGS = @GMCPPFLAGS@
- GMLIBS = @GMLIBS@
- GMLND = @GMLND@
-+GREP = @GREP@
- IIBCPPFLAGS = @IIBCPPFLAGS@
- IIBLND = @IIBLND@
- INCLUDE_RULES = @INCLUDE_RULES@
-@@ -218,8 +217,6 @@
- VIBLND = @VIBLND@
- ac_configure_args = @ac_configure_args@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- agentdir = @agentdir@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -233,34 +230,37 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- demodir = @demodir@
- docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
--kextdir = @kextdir@
- lb_target_os = @lb_target_os@
- libdir = @libdir@
- libexecdir = @libexecdir@
- linux25 = @linux25@
-+localedir = @localedir@
- localstatedir = @localstatedir@
--macosdir = @macosdir@
- mandir = @mandir@
- mibdir = @mibdir@
- moduledir = @moduledir@
- modulefsdir = @modulefsdir@
- modulenetdir = @modulenetdir@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pkgexampledir = @pkgexampledir@
--plistdir = @plistdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- rootsbindir = @rootsbindir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-@@ -421,7 +421,7 @@
- installcheck: installcheck-am
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-- INSTALL_STRIP_FLAG=-s \
-+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lustre/include/lustre/Makefile.in lustre-1.6.2/lustre/include/lustre/Makefile.in
---- lustre-1.6.2~/lustre/include/lustre/Makefile.in 2007-08-30 00:29:55.000000000 +0200
-+++ lustre-1.6.2/lustre/include/lustre/Makefile.in 2007-09-06 14:19:08.705481952 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.7.8 from Makefile.am.
-+# Makefile.in generated by automake 1.7.9 from Makefile.am.
- # @configure_input@
-
- # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-@@ -117,12 +117,11 @@
- EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
- EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
- EXTRA_KCFLAGS = @EXTRA_KCFLAGS@
--EXTRA_KLDFLAGS = @EXTRA_KLDFLAGS@
--EXTRA_KLIBS = @EXTRA_KLIBS@
- EXTRA_LNET_INCLUDE = @EXTRA_LNET_INCLUDE@
- GMCPPFLAGS = @GMCPPFLAGS@
- GMLIBS = @GMLIBS@
- GMLND = @GMLND@
-+GREP = @GREP@
- IIBCPPFLAGS = @IIBCPPFLAGS@
- IIBLND = @IIBLND@
- INCLUDE_RULES = @INCLUDE_RULES@
-@@ -218,8 +217,6 @@
- VIBLND = @VIBLND@
- ac_configure_args = @ac_configure_args@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- agentdir = @agentdir@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -233,34 +230,37 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- demodir = @demodir@
- docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
--kextdir = @kextdir@
- lb_target_os = @lb_target_os@
- libdir = @libdir@
- libexecdir = @libexecdir@
- linux25 = @linux25@
-+localedir = @localedir@
- localstatedir = @localstatedir@
--macosdir = @macosdir@
- mandir = @mandir@
- mibdir = @mibdir@
- moduledir = @moduledir@
- modulefsdir = @modulefsdir@
- modulenetdir = @modulenetdir@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pkgexampledir = @pkgexampledir@
--plistdir = @plistdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- rootsbindir = @rootsbindir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-@@ -414,7 +414,7 @@
- installcheck: installcheck-am
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-- INSTALL_STRIP_FLAG=-s \
-+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lustre/ldlm/Makefile.in lustre-1.6.2/lustre/ldlm/Makefile.in
---- lustre-1.6.2~/lustre/ldlm/Makefile.in 2007-08-30 00:29:55.000000000 +0200
-+++ lustre-1.6.2/lustre/ldlm/Makefile.in 2007-09-06 14:19:08.769472190 +0200
+diff -Nurwd orig/lustre-1.6.2/lustre/ldlm/Makefile.in lustre-1.6.2/lustre/ldlm/Makefile.in
+--- orig/lustre-1.6.2/lustre/ldlm/Makefile.in 2007-08-30 00:29:55.000000000 +0200
++++ lustre-1.6.2/lustre/ldlm/Makefile.in 2007-09-14 13:58:33.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.8 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
@@ -57084,9 +56834,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lustre/liblustre/Makefile.in lustre-1.6.2/lustre/liblustre/Makefile.in
---- lustre-1.6.2~/lustre/liblustre/Makefile.in 2007-09-06 14:18:08.984592748 +0200
-+++ lustre-1.6.2/lustre/liblustre/Makefile.in 2007-09-06 14:19:08.879455411 +0200
+diff -Nurwd orig/lustre-1.6.2/lustre/liblustre/Makefile.in lustre-1.6.2/lustre/liblustre/Makefile.in
+--- orig/lustre-1.6.2/lustre/liblustre/Makefile.in 2007-08-30 00:29:55.000000000 +0200
++++ lustre-1.6.2/lustre/liblustre/Makefile.in 2007-09-14 13:58:33.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.8 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
@@ -57166,9 +56916,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lustre/liblustre/tests/Makefile.in lustre-1.6.2/lustre/liblustre/tests/Makefile.in
---- lustre-1.6.2~/lustre/liblustre/tests/Makefile.in 2007-08-30 00:29:55.000000000 +0200
-+++ lustre-1.6.2/lustre/liblustre/tests/Makefile.in 2007-09-06 14:19:09.069426430 +0200
+diff -Nurwd orig/lustre-1.6.2/lustre/liblustre/tests/Makefile.in lustre-1.6.2/lustre/liblustre/tests/Makefile.in
+--- orig/lustre-1.6.2/lustre/liblustre/tests/Makefile.in 2007-08-30 00:29:55.000000000 +0200
++++ lustre-1.6.2/lustre/liblustre/tests/Makefile.in 2007-09-14 13:58:33.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.8 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
@@ -57248,9 +56998,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lustre/llite/autoMakefile.in lustre-1.6.2/lustre/llite/autoMakefile.in
---- lustre-1.6.2~/lustre/llite/autoMakefile.in 2007-08-30 00:29:56.000000000 +0200
-+++ lustre-1.6.2/lustre/llite/autoMakefile.in 2007-09-06 14:19:09.139415753 +0200
+diff -Nurwd orig/lustre-1.6.2/lustre/llite/autoMakefile.in lustre-1.6.2/lustre/llite/autoMakefile.in
+--- orig/lustre-1.6.2/lustre/llite/autoMakefile.in 2007-08-30 00:29:56.000000000 +0200
++++ lustre-1.6.2/lustre/llite/autoMakefile.in 2007-09-14 13:58:34.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -57330,9 +57080,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lustre/lov/autoMakefile.in lustre-1.6.2/lustre/lov/autoMakefile.in
---- lustre-1.6.2~/lustre/lov/autoMakefile.in 2007-08-30 00:29:56.000000000 +0200
-+++ lustre-1.6.2/lustre/lov/autoMakefile.in 2007-09-06 14:19:09.296391805 +0200
+diff -Nurwd orig/lustre-1.6.2/lustre/lov/autoMakefile.in lustre-1.6.2/lustre/lov/autoMakefile.in
+--- orig/lustre-1.6.2/lustre/lov/autoMakefile.in 2007-08-30 00:29:56.000000000 +0200
++++ lustre-1.6.2/lustre/lov/autoMakefile.in 2007-09-14 13:58:34.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -57762,9 +57512,9 @@
install-data-hook: $(install_data_hook)
-diff -urNad lustre-1.6.2~/lustre/lvfs/autoMakefile.in lustre-1.6.2/lustre/lvfs/autoMakefile.in
---- lustre-1.6.2~/lustre/lvfs/autoMakefile.in 2007-08-30 00:29:56.000000000 +0200
-+++ lustre-1.6.2/lustre/lvfs/autoMakefile.in 2007-09-06 14:19:09.410374416 +0200
+diff -Nurwd orig/lustre-1.6.2/lustre/lvfs/autoMakefile.in lustre-1.6.2/lustre/lvfs/autoMakefile.in
+--- orig/lustre-1.6.2/lustre/lvfs/autoMakefile.in 2007-08-30 00:29:56.000000000 +0200
++++ lustre-1.6.2/lustre/lvfs/autoMakefile.in 2007-09-14 13:58:34.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -58042,9 +57792,9 @@
@LINUX_TRUE@@MODULES_TRUE@@SERVER_TRUE at sources: fsfilt_$(BACKINGFS).c
-diff -urNad lustre-1.6.2~/lustre/mdc/autoMakefile.in lustre-1.6.2/lustre/mdc/autoMakefile.in
---- lustre-1.6.2~/lustre/mdc/autoMakefile.in 2007-08-30 00:29:56.000000000 +0200
-+++ lustre-1.6.2/lustre/mdc/autoMakefile.in 2007-09-06 14:19:09.520357638 +0200
+diff -Nurwd orig/lustre-1.6.2/lustre/mdc/autoMakefile.in lustre-1.6.2/lustre/mdc/autoMakefile.in
+--- orig/lustre-1.6.2/lustre/mdc/autoMakefile.in 2007-08-30 00:29:56.000000000 +0200
++++ lustre-1.6.2/lustre/mdc/autoMakefile.in 2007-09-14 13:58:34.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -58124,9 +57874,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lustre/mds/autoMakefile.in lustre-1.6.2/lustre/mds/autoMakefile.in
---- lustre-1.6.2~/lustre/mds/autoMakefile.in 2007-08-30 00:29:56.000000000 +0200
-+++ lustre-1.6.2/lustre/mds/autoMakefile.in 2007-09-06 14:19:09.590346960 +0200
+diff -Nurwd orig/lustre-1.6.2/lustre/mds/autoMakefile.in lustre-1.6.2/lustre/mds/autoMakefile.in
+--- orig/lustre-1.6.2/lustre/mds/autoMakefile.in 2007-08-30 00:29:56.000000000 +0200
++++ lustre-1.6.2/lustre/mds/autoMakefile.in 2007-09-14 13:58:34.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -58206,9 +57956,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lustre/mgc/autoMakefile.in lustre-1.6.2/lustre/mgc/autoMakefile.in
---- lustre-1.6.2~/lustre/mgc/autoMakefile.in 2007-08-30 00:29:56.000000000 +0200
-+++ lustre-1.6.2/lustre/mgc/autoMakefile.in 2007-09-06 14:19:09.690331707 +0200
+diff -Nurwd orig/lustre-1.6.2/lustre/mgc/autoMakefile.in lustre-1.6.2/lustre/mgc/autoMakefile.in
+--- orig/lustre-1.6.2/lustre/mgc/autoMakefile.in 2007-08-30 00:29:56.000000000 +0200
++++ lustre-1.6.2/lustre/mgc/autoMakefile.in 2007-09-14 13:58:34.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -58288,9 +58038,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lustre/mgs/autoMakefile.in lustre-1.6.2/lustre/mgs/autoMakefile.in
---- lustre-1.6.2~/lustre/mgs/autoMakefile.in 2007-08-30 00:29:56.000000000 +0200
-+++ lustre-1.6.2/lustre/mgs/autoMakefile.in 2007-09-06 14:19:09.765320267 +0200
+diff -Nurwd orig/lustre-1.6.2/lustre/mgs/autoMakefile.in lustre-1.6.2/lustre/mgs/autoMakefile.in
+--- orig/lustre-1.6.2/lustre/mgs/autoMakefile.in 2007-08-30 00:29:56.000000000 +0200
++++ lustre-1.6.2/lustre/mgs/autoMakefile.in 2007-09-14 13:58:34.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -58370,9 +58120,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lustre/obdclass/autoMakefile.in lustre-1.6.2/lustre/obdclass/autoMakefile.in
---- lustre-1.6.2~/lustre/obdclass/autoMakefile.in 2007-08-30 00:29:57.000000000 +0200
-+++ lustre-1.6.2/lustre/obdclass/autoMakefile.in 2007-09-06 14:19:09.947292506 +0200
+diff -Nurwd orig/lustre-1.6.2/lustre/obdclass/autoMakefile.in lustre-1.6.2/lustre/obdclass/autoMakefile.in
+--- orig/lustre-1.6.2/lustre/obdclass/autoMakefile.in 2007-08-30 00:29:57.000000000 +0200
++++ lustre-1.6.2/lustre/obdclass/autoMakefile.in 2007-09-14 13:58:34.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -59078,9 +58828,9 @@
install-data-hook: $(install_data_hook)
-diff -urNad lustre-1.6.2~/lustre/obdclass/linux/Makefile.in lustre-1.6.2/lustre/obdclass/linux/Makefile.in
---- lustre-1.6.2~/lustre/obdclass/linux/Makefile.in 2007-08-30 00:29:57.000000000 +0200
-+++ lustre-1.6.2/lustre/obdclass/linux/Makefile.in 2007-09-06 14:19:10.011282744 +0200
+diff -Nurwd orig/lustre-1.6.2/lustre/obdclass/linux/Makefile.in lustre-1.6.2/lustre/obdclass/linux/Makefile.in
+--- orig/lustre-1.6.2/lustre/obdclass/linux/Makefile.in 2007-08-30 00:29:57.000000000 +0200
++++ lustre-1.6.2/lustre/obdclass/linux/Makefile.in 2007-09-14 13:58:35.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.8 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
@@ -59160,9 +58910,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lustre/obdecho/autoMakefile.in lustre-1.6.2/lustre/obdecho/autoMakefile.in
---- lustre-1.6.2~/lustre/obdecho/autoMakefile.in 2007-08-30 00:29:57.000000000 +0200
-+++ lustre-1.6.2/lustre/obdecho/autoMakefile.in 2007-09-06 14:19:10.111267491 +0200
+diff -Nurwd orig/lustre-1.6.2/lustre/obdecho/autoMakefile.in lustre-1.6.2/lustre/obdecho/autoMakefile.in
+--- orig/lustre-1.6.2/lustre/obdecho/autoMakefile.in 2007-08-30 00:29:57.000000000 +0200
++++ lustre-1.6.2/lustre/obdecho/autoMakefile.in 2007-09-14 13:58:35.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -59489,9 +59239,9 @@
install-data-hook: $(install_data_hook)
-diff -urNad lustre-1.6.2~/lustre/obdfilter/autoMakefile.in lustre-1.6.2/lustre/obdfilter/autoMakefile.in
---- lustre-1.6.2~/lustre/obdfilter/autoMakefile.in 2007-08-30 00:29:57.000000000 +0200
-+++ lustre-1.6.2/lustre/obdfilter/autoMakefile.in 2007-09-06 14:19:10.180256966 +0200
+diff -Nurwd orig/lustre-1.6.2/lustre/obdfilter/autoMakefile.in lustre-1.6.2/lustre/obdfilter/autoMakefile.in
+--- orig/lustre-1.6.2/lustre/obdfilter/autoMakefile.in 2007-08-30 00:29:57.000000000 +0200
++++ lustre-1.6.2/lustre/obdfilter/autoMakefile.in 2007-09-14 13:58:35.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -59571,9 +59321,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lustre/osc/autoMakefile.in lustre-1.6.2/lustre/osc/autoMakefile.in
---- lustre-1.6.2~/lustre/osc/autoMakefile.in 2007-08-30 00:29:58.000000000 +0200
-+++ lustre-1.6.2/lustre/osc/autoMakefile.in 2007-09-06 14:19:10.296239272 +0200
+diff -Nurwd orig/lustre-1.6.2/lustre/osc/autoMakefile.in lustre-1.6.2/lustre/osc/autoMakefile.in
+--- orig/lustre-1.6.2/lustre/osc/autoMakefile.in 2007-08-30 00:29:58.000000000 +0200
++++ lustre-1.6.2/lustre/osc/autoMakefile.in 2007-09-14 13:58:35.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -59875,9 +59625,9 @@
install-data-hook: $(install_data_hook)
-diff -urNad lustre-1.6.2~/lustre/ost/autoMakefile.in lustre-1.6.2/lustre/ost/autoMakefile.in
---- lustre-1.6.2~/lustre/ost/autoMakefile.in 2007-08-30 00:29:58.000000000 +0200
-+++ lustre-1.6.2/lustre/ost/autoMakefile.in 2007-09-06 14:19:10.365228747 +0200
+diff -Nurwd orig/lustre-1.6.2/lustre/ost/autoMakefile.in lustre-1.6.2/lustre/ost/autoMakefile.in
+--- orig/lustre-1.6.2/lustre/ost/autoMakefile.in 2007-08-30 00:29:58.000000000 +0200
++++ lustre-1.6.2/lustre/ost/autoMakefile.in 2007-09-14 13:58:35.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -59957,9 +59707,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lustre/ptlrpc/autoMakefile.in lustre-1.6.2/lustre/ptlrpc/autoMakefile.in
---- lustre-1.6.2~/lustre/ptlrpc/autoMakefile.in 2007-08-30 00:29:58.000000000 +0200
-+++ lustre-1.6.2/lustre/ptlrpc/autoMakefile.in 2007-09-06 14:19:10.603192444 +0200
+diff -Nurwd orig/lustre-1.6.2/lustre/ptlrpc/autoMakefile.in lustre-1.6.2/lustre/ptlrpc/autoMakefile.in
+--- orig/lustre-1.6.2/lustre/ptlrpc/autoMakefile.in 2007-08-30 00:29:58.000000000 +0200
++++ lustre-1.6.2/lustre/ptlrpc/autoMakefile.in 2007-09-14 13:58:35.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -60924,9 +60674,9 @@
install-data-hook: $(install_data_hook)
-diff -urNad lustre-1.6.2~/lustre/quota/autoMakefile.in lustre-1.6.2/lustre/quota/autoMakefile.in
---- lustre-1.6.2~/lustre/quota/autoMakefile.in 2007-08-30 00:29:58.000000000 +0200
-+++ lustre-1.6.2/lustre/quota/autoMakefile.in 2007-09-06 14:19:10.716175208 +0200
+diff -Nurwd orig/lustre-1.6.2/lustre/quota/autoMakefile.in lustre-1.6.2/lustre/quota/autoMakefile.in
+--- orig/lustre-1.6.2/lustre/quota/autoMakefile.in 2007-08-30 00:29:58.000000000 +0200
++++ lustre-1.6.2/lustre/quota/autoMakefile.in 2007-09-14 13:58:35.000000000 +0200
@@ -1,4 +1,4 @@
-# autoMakefile.in generated by automake 1.7.8 from autoMakefile.am.
+# autoMakefile.in generated by automake 1.7.9 from autoMakefile.am.
@@ -61006,9 +60756,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lustre/scripts/Makefile.in lustre-1.6.2/lustre/scripts/Makefile.in
---- lustre-1.6.2~/lustre/scripts/Makefile.in 2007-08-30 00:29:58.000000000 +0200
-+++ lustre-1.6.2/lustre/scripts/Makefile.in 2007-09-06 14:19:10.791163768 +0200
+diff -Nurwd orig/lustre-1.6.2/lustre/scripts/Makefile.in lustre-1.6.2/lustre/scripts/Makefile.in
+--- orig/lustre-1.6.2/lustre/scripts/Makefile.in 2007-08-30 00:29:58.000000000 +0200
++++ lustre-1.6.2/lustre/scripts/Makefile.in 2007-09-14 13:58:35.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.8 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
@@ -61088,9 +60838,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lustre/tests/Makefile.in lustre-1.6.2/lustre/tests/Makefile.in
---- lustre-1.6.2~/lustre/tests/Makefile.in 2007-08-30 00:29:59.000000000 +0200
-+++ lustre-1.6.2/lustre/tests/Makefile.in 2007-09-06 14:19:11.101116483 +0200
+diff -Nurwd orig/lustre-1.6.2/lustre/tests/Makefile.in lustre-1.6.2/lustre/tests/Makefile.in
+--- orig/lustre-1.6.2/lustre/tests/Makefile.in 2007-08-30 00:29:59.000000000 +0200
++++ lustre-1.6.2/lustre/tests/Makefile.in 2007-09-14 13:58:36.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.8 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
@@ -61170,9 +60920,9 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/lustre/utils/Makefile.in lustre-1.6.2/lustre/utils/Makefile.in
---- lustre-1.6.2~/lustre/utils/Makefile.in 2007-08-30 00:29:59.000000000 +0200
-+++ lustre-1.6.2/lustre/utils/Makefile.in 2007-09-06 14:19:11.302085824 +0200
+diff -Nurwd orig/lustre-1.6.2/lustre/utils/Makefile.in lustre-1.6.2/lustre/utils/Makefile.in
+--- orig/lustre-1.6.2/lustre/utils/Makefile.in 2007-08-30 00:29:59.000000000 +0200
++++ lustre-1.6.2/lustre/utils/Makefile.in 2007-09-14 13:58:36.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.8 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
@@ -61252,9 +61002,91 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/snmp/Makefile.in lustre-1.6.2/snmp/Makefile.in
---- lustre-1.6.2~/snmp/Makefile.in 2007-08-30 00:29:59.000000000 +0200
-+++ lustre-1.6.2/snmp/Makefile.in 2007-09-06 14:19:11.422067520 +0200
+diff -Nurwd orig/lustre-1.6.2/snmp/autoconf/Makefile.in lustre-1.6.2/snmp/autoconf/Makefile.in
+--- orig/lustre-1.6.2/snmp/autoconf/Makefile.in 2007-08-30 00:29:59.000000000 +0200
++++ lustre-1.6.2/snmp/autoconf/Makefile.in 2007-09-14 13:58:36.000000000 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.7.8 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+
+ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+@@ -112,12 +112,11 @@
+ EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
+ EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
+ EXTRA_KCFLAGS = @EXTRA_KCFLAGS@
+-EXTRA_KLDFLAGS = @EXTRA_KLDFLAGS@
+-EXTRA_KLIBS = @EXTRA_KLIBS@
+ EXTRA_LNET_INCLUDE = @EXTRA_LNET_INCLUDE@
+ GMCPPFLAGS = @GMCPPFLAGS@
+ GMLIBS = @GMLIBS@
+ GMLND = @GMLND@
++GREP = @GREP@
+ IIBCPPFLAGS = @IIBCPPFLAGS@
+ IIBLND = @IIBLND@
+ INCLUDE_RULES = @INCLUDE_RULES@
+@@ -213,8 +212,6 @@
+ VIBLND = @VIBLND@
+ ac_configure_args = @ac_configure_args@
+ ac_ct_CC = @ac_ct_CC@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ agentdir = @agentdir@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+@@ -228,34 +225,37 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ demodir = @demodir@
+ docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-kextdir = @kextdir@
+ lb_target_os = @lb_target_os@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+ linux25 = @linux25@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+-macosdir = @macosdir@
+ mandir = @mandir@
+ mibdir = @mibdir@
+ moduledir = @moduledir@
+ modulefsdir = @modulefsdir@
+ modulenetdir = @modulenetdir@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pkgexampledir = @pkgexampledir@
+-plistdir = @plistdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ rootsbindir = @rootsbindir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+@@ -337,7 +337,7 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- INSTALL_STRIP_FLAG=-s \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ mostlyclean-generic:
+diff -Nurwd orig/lustre-1.6.2/snmp/Makefile.in lustre-1.6.2/snmp/Makefile.in
+--- orig/lustre-1.6.2/snmp/Makefile.in 2007-08-30 00:29:59.000000000 +0200
++++ lustre-1.6.2/snmp/Makefile.in 2007-09-14 13:58:36.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.8 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
@@ -61334,85 +61166,3 @@
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-diff -urNad lustre-1.6.2~/snmp/autoconf/Makefile.in lustre-1.6.2/snmp/autoconf/Makefile.in
---- lustre-1.6.2~/snmp/autoconf/Makefile.in 2007-08-30 00:29:59.000000000 +0200
-+++ lustre-1.6.2/snmp/autoconf/Makefile.in 2007-09-06 14:19:11.492056843 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.7.8 from Makefile.am.
-+# Makefile.in generated by automake 1.7.9 from Makefile.am.
- # @configure_input@
-
- # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-@@ -112,12 +112,11 @@
- EXT2FS_DEVEL_FALSE = @EXT2FS_DEVEL_FALSE@
- EXT2FS_DEVEL_TRUE = @EXT2FS_DEVEL_TRUE@
- EXTRA_KCFLAGS = @EXTRA_KCFLAGS@
--EXTRA_KLDFLAGS = @EXTRA_KLDFLAGS@
--EXTRA_KLIBS = @EXTRA_KLIBS@
- EXTRA_LNET_INCLUDE = @EXTRA_LNET_INCLUDE@
- GMCPPFLAGS = @GMCPPFLAGS@
- GMLIBS = @GMLIBS@
- GMLND = @GMLND@
-+GREP = @GREP@
- IIBCPPFLAGS = @IIBCPPFLAGS@
- IIBLND = @IIBLND@
- INCLUDE_RULES = @INCLUDE_RULES@
-@@ -213,8 +212,6 @@
- VIBLND = @VIBLND@
- ac_configure_args = @ac_configure_args@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- agentdir = @agentdir@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -228,34 +225,37 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- demodir = @demodir@
- docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
--kextdir = @kextdir@
- lb_target_os = @lb_target_os@
- libdir = @libdir@
- libexecdir = @libexecdir@
- linux25 = @linux25@
-+localedir = @localedir@
- localstatedir = @localstatedir@
--macosdir = @macosdir@
- mandir = @mandir@
- mibdir = @mibdir@
- moduledir = @moduledir@
- modulefsdir = @modulefsdir@
- modulenetdir = @modulenetdir@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pkgexampledir = @pkgexampledir@
--plistdir = @plistdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- rootsbindir = @rootsbindir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-@@ -337,7 +337,7 @@
- installcheck: installcheck-am
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-- INSTALL_STRIP_FLAG=-s \
-+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
More information about the Pkg-lustre-svn-commit
mailing list