fix for build portals in user space

diff --git a/lnet/Makefile.am b/lnet/Makefile.am
index 3c42103..1c28b64 100644 (file)
--- a/lnet/Makefile.am
+++ b/lnet/Makefile.am
@@ -5,4 +5,8 @@
 
 EXTRA_DIST = Rules.linux archdep.m4 MCP
 DIST_SUBDIRS = libcfs portals knals unals utils tests doc router
+if LIBLUSTRE
+SUBDIRS = portals unals utils
+else
 SUBDIRS = libcfs portals knals unals utils tests doc router
+endif

diff --git a/lnet/archdep.m4 b/lnet/archdep.m4
index 0315644..4a00a8d 100644 (file)
--- a/lnet/archdep.m4
+++ b/lnet/archdep.m4
@@ -52,6 +52,8 @@ case ${host_cpu} in
        AC_MSG_RESULT($host_cpu)
        KCFLAGS='-g -Wall '
        KCPPFLAGS='-D__arch_lib__ '
+       AM_CONDITIONAL(LIBLUSTRE, test x$host_cpu = xlib)
+       libdir='${exec_prefix}/lib/lustre'
         MOD_LINK=elf_i386
 ;;
        um )
@@ -203,4 +205,4 @@ CFLAGS="$KCFLAGS"
 CPPFLAGS="$KINCFLAGS $KCPPFLAGS $MFLAGS "
 
 AC_SUBST(MOD_LINK)
-AC_SUBST(LINUX25)
\ No newline at end of file
+AC_SUBST(LINUX25)

diff --git a/lnet/build.m4 b/lnet/build.m4
index 4e8dbbb..2f2b9e4 100644 (file)
--- a/lnet/build.m4
+++ b/lnet/build.m4
@@ -94,15 +94,6 @@ fi
 AC_SUBST(LIBEFENCE)
 AC_SUBST(HAVE_LIBEFENCE)
 
-AM_CONDITIONAL(LIBLUSTRE, test x$host_cpu = xlib)
-AC_MSG_CHECKING(if you are building lib lustre)
-if test "$host_cpu" = "lib"; then
-   AC_MSG_RESULT(yes)
-   libdir='${exec_prefix}/lib/lustre'
-else
-   AC_MSG_RESULT(no)
-fi
-
 # end -------- Kernel build environment. -----------------
 
 

diff --git a/lustre/portals/Makefile.am b/lustre/portals/Makefile.am
index 3c42103..1c28b64 100644 (file)
--- a/lustre/portals/Makefile.am
+++ b/lustre/portals/Makefile.am
@@ -5,4 +5,8 @@
 
 EXTRA_DIST = Rules.linux archdep.m4 MCP
 DIST_SUBDIRS = libcfs portals knals unals utils tests doc router
+if LIBLUSTRE
+SUBDIRS = portals unals utils
+else
 SUBDIRS = libcfs portals knals unals utils tests doc router
+endif

diff --git a/lustre/portals/archdep.m4 b/lustre/portals/archdep.m4
index 0315644..4a00a8d 100644 (file)
--- a/lustre/portals/archdep.m4
+++ b/lustre/portals/archdep.m4
@@ -52,6 +52,8 @@ case ${host_cpu} in
        AC_MSG_RESULT($host_cpu)
        KCFLAGS='-g -Wall '
        KCPPFLAGS='-D__arch_lib__ '
+       AM_CONDITIONAL(LIBLUSTRE, test x$host_cpu = xlib)
+       libdir='${exec_prefix}/lib/lustre'
         MOD_LINK=elf_i386
 ;;
        um )
@@ -203,4 +205,4 @@ CFLAGS="$KCFLAGS"
 CPPFLAGS="$KINCFLAGS $KCPPFLAGS $MFLAGS "
 
 AC_SUBST(MOD_LINK)
-AC_SUBST(LINUX25)
\ No newline at end of file
+AC_SUBST(LINUX25)

diff --git a/lustre/portals/build.m4 b/lustre/portals/build.m4
index 4e8dbbb..2f2b9e4 100644 (file)
--- a/lustre/portals/build.m4
+++ b/lustre/portals/build.m4
@@ -94,15 +94,6 @@ fi
 AC_SUBST(LIBEFENCE)
 AC_SUBST(HAVE_LIBEFENCE)
 
-AM_CONDITIONAL(LIBLUSTRE, test x$host_cpu = xlib)
-AC_MSG_CHECKING(if you are building lib lustre)
-if test "$host_cpu" = "lib"; then
-   AC_MSG_RESULT(yes)
-   libdir='${exec_prefix}/lib/lustre'
-else
-   AC_MSG_RESULT(no)
-fi
-
 # end -------- Kernel build environment. -----------------