X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=build%2Fautoconf%2Flustre-build.m4;h=1851e9566293b6b37075c602ec7966af7c753cda;hb=322d37ad3c09579477fa1d6790d5fe091311215c;hp=2a1b1d005d3fb3d76f6ec5a301e28c22c0125112;hpb=9f65644cb25e4f89553d90861020767302f05583;p=fs%2Flustre-release.git

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index 2a1b1d0..1851e95 100644
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -27,9 +27,8 @@ case x$with_sysio in
 		AC_CHECK_FILE([$srcdir/libsysio/src/rmdir.c],[],[
 			AC_MSG_ERROR([A complete internal libsysio was not found.])
 		])
-		AC_CONFIG_SUBDIRS(libsysio)
 		LIBSYSIO_SUBDIR="libsysio"
-		SYSIO='$(top_srcdir)/libsysio'
+		SYSIO="$PWD/libsysio"
 		;;
 	xno)
 		AC_MSG_RESULT([disabled])
@@ -40,11 +39,13 @@ case x$with_sysio in
 			AC_MSG_ERROR([A complete (built) external libsysio was not found.])
 		])
 		SYSIO=$with_sysio
-		enable_sysio="yes"
+		with_sysio="yes"
 		;;
 esac
-AC_SUBST(LIBSYSIO_SUBDIR)
-AC_SUBST(SYSIO)
+
+# We have to configure even if we don't build here for make dist to
+# work
+AC_CONFIG_SUBDIRS(libsysio)
 ])
 
 #
@@ -322,6 +323,7 @@ CFLAGS_save="$CFLAGS"
 CFLAGS="-m64 $CFLAGS"
 AC_TRY_COMPILE([],[],[
 	AC_MSG_RESULT([yes])
+	EXTRA_KCFLAGS="-m64 $EXTRA_KCFLAGS"
 ],[
 	AC_MSG_RESULT([no])
 	CFLAGS="$CFLAGS_save"
@@ -336,7 +338,7 @@ LLCFLAGS="-g -Wall -fPIC"
 AC_SUBST(LLCFLAGS)
 
 # everyone builds against portals and lustre
-EXTRA_KCFLAGS="-g -I$PWD/portals/include -I$PWD/lustre/include"
+EXTRA_KCFLAGS="$EXTRA_KCFLAGS -g -I$PWD/portals/include -I$PWD/lustre/include"
 AC_SUBST(EXTRA_KCFLAGS)
 ])
 
@@ -353,6 +355,17 @@ AM_CONDITIONAL(DOC, test x$ENABLE_DOC = x1)
 AM_CONDITIONAL(CRAY_PORTALS, test x$with_cray_portals != xno)
 AM_CONDITIONAL(INIT_SCRIPTS, test x$ENABLE_INIT_SCRIPTS = "x1")
 
+# this lets lustre cancel libsysio, per-branch or if liblustre is
+# disabled
+if test "x$LIBSYSIO_SUBDIR" = xlibsysio ; then
+	if test "x$with_sysio" != xyes ; then
+		SYSIO=""
+		LIBSYSIO_SUBDIR=""
+	fi
+fi
+AC_SUBST(LIBSYSIO_SUBDIR)
+AC_SUBST(SYSIO)
+
 LB_LINUX_CONDITIONALS
 LB_DARWIN_CONDITIONALS