From dfc07ccedbfb1a6ab8417919568cc392faf485d4 Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Thu, 3 Mar 2011 08:49:43 -0500 Subject: [PATCH] LU-98 Fix defects in bug 14949 implementation 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 Change-Id: Id064c688d63e3e70a90b725e49831b9c319229f0 Reviewed-on: http://review.whamcloud.com/294 Tested-by: Hudson Reviewed-by: Robert Read Reviewed-by: Michael MacDonald Reviewed-by: Oleg Drokin --- Makefile.in | 1 - autoMakefile.am | 2 +- build/autoconf/lustre-build.m4 | 1 - lustre-iokit/configure.ac | 1 + 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index 84ab41900..9272de6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,5 +1,4 @@ subdir-m += @LIBCFS_SUBDIR@ lnet subdir-m += lustre -subdir-m += lustre-iokit @INCLUDE_RULES@ diff --git a/autoMakefile.am b/autoMakefile.am index e65baac..5d1d839 100644 --- a/autoMakefile.am +++ b/autoMakefile.am @@ -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 diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4 index 314818c..dd43a7e 100644 --- a/build/autoconf/lustre-build.m4 +++ b/build/autoconf/lustre-build.m4 @@ -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) diff --git a/lustre-iokit/configure.ac b/lustre-iokit/configure.ac index 49b6fc4..2ec1c4a 100644 --- a/lustre-iokit/configure.ac +++ b/lustre-iokit/configure.ac @@ -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) -- 1.8.3.1