Whamcloud - gitweb
LU-98 Fix defects in bug 14949 implementation
authorBrian J. Murrell <brian@whamcloud.com>
Thu, 3 Mar 2011 13:49:43 +0000 (08:49 -0500)
committerOleg Drokin <green@whamcloud.com>
Fri, 8 Apr 2011 13:34:03 +0000 (06:34 -0700)
Some of the details of the implentation of bug 14949 "integrate
lustre-iokit into normal build process" were incorrect.  This was leading
to a problem when trying to build with "make rpms" after configuring without
the iokit.

Signed-off-by: Brian J. Murrell <brian@whamcloud.com>
Change-Id: Id064c688d63e3e70a90b725e49831b9c319229f0
Reviewed-on: http://review.whamcloud.com/294
Tested-by: Hudson
Reviewed-by: Robert Read <rread@whamcloud.com>
Reviewed-by: Michael MacDonald <mjmac@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Makefile.in
autoMakefile.am
build/autoconf/lustre-build.m4
lustre-iokit/configure.ac

index 84ab419..9272de6 100644 (file)
@@ -1,5 +1,4 @@
 subdir-m += @LIBCFS_SUBDIR@ lnet
 subdir-m += lustre
-subdir-m += lustre-iokit
 
 @INCLUDE_RULES@
index e65baac..5d1d839 100644 (file)
@@ -1,5 +1,5 @@
 SUBDIRS := @LDISKFS_SUBDIR@ @SPL_SUBDIR@ @ZFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
-DIST_SUBDIRS := @SNMP_DIST_SUBDIR@ libsysio ldiskfs @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre 
+DIST_SUBDIRS := @SNMP_DIST_SUBDIR@ libsysio ldiskfs lustre-iokit @LIBCFS_SUBDIR@ lnet lustre 
 SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
 RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_SUBDIR@
 if LDISKFS_ENABLED
index 314818c..dd43a7e 100644 (file)
@@ -258,7 +258,6 @@ case x$with_lustre_iokit in
                        AC_MSG_ERROR([A complete (built) external lustre-iokit was not found.])
                ])
                LUSTREIOKIT="$with_lustre_iokit"
-               with_lustre_iokit="yes"
                ;;
 esac
 AC_SUBST(LUSTREIOKIT_SUBDIR)
index 49b6fc4..2ec1c4a 100644 (file)
@@ -1,4 +1,5 @@
 AC_INIT
+AC_CONFIG_AUX_DIR([.])
 AM_INIT_AUTOMAKE(lustre-iokit,1.2)
 AC_PATH_PROGS(BASH, bash)
 AC_PATH_PROGS(PERL, perl)