Branch b1_6

Only copy Module.symvers if ldiskfs is enabled; fixes patchless build.

b=12842
i=johann
i=zhenyu.xu

diff --git a/autoMakefile.am b/autoMakefile.am
index c022f52..ab75c70 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -2,14 +2,18 @@ SUBDIRS := @LDISKFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ lnet lustre
 DIST_SUBDIRS := @SNMP_DIST_SUBDIR@ libsysio ldiskfs lnet lustre
 SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ lnet lustre
 RPM_SUBDIRS := @LDISKFS_SUBDIR@
+if LDISKFS_ENABLED
 EXTRA_SOURCES := @SYMVERFILE@
+endif
 
 include build/autoMakefile.am.toplevel
 
 EXTRA_DIST += config.h.in
 
+if LDISKFS_ENABLED
 @SYMVERFILE@: @LDISKFS_DIR@/@SYMVERFILE@
        cp @LDISKFS_DIR@/@SYMVERFILE@ @SYMVERFILE@
+endif
 
 CSTK=/tmp/checkstack
 CSTKO=/tmp/checkstack.orig

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index a3acf70..fbc639c 100644 (file)
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -198,6 +198,7 @@ case x$with_ldiskfs in
 esac
 AC_SUBST(LDISKFS_DIR)
 AC_SUBST(LDISKFS_SUBDIR)
+AM_CONDITIONAL(LDISKFS_ENABLED, test x$with_ldiskfs != xno)
 
 # We have to configure even if we don't build here for make dist to work
 AC_CONFIG_SUBDIRS(ldiskfs)

diff --git a/configure.ac b/configure.ac
index 889fe34..102257d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,6 +2,9 @@
 AC_INIT([Lustre], [LUSTRE_VERSION], [https://bugzilla.lustre.org/], [lustre])
 sinclude(lustre/autoconf/lustre-version.ac)
 
+# Overridden in LB_PATH_LDISKFS on certain branches
+AM_CONDITIONAL(LDISKFS_ENABLED, false)
+
 LB_CHECK_VERSION
 
 LC_CONFIG_SRCDIR