land 0.5.20.3 b_devel onto HEAD (b_devel will remain)

[fs/lustre-release.git] / lustre / archdep.m4

diff --git a/lustre/archdep.m4 b/lustre/archdep.m4
index 58a6576..2bdd785 100644 (file)
--- a/lustre/archdep.m4
+++ b/lustre/archdep.m4
@@ -1,4 +1,10 @@
+AC_ARG_WITH(lib, [  --with-lib compile lustre library], host_cpu="lib")
+
 AC_MSG_CHECKING(if you are running user mode linux for $host_cpu ...)
+if test $host_cpu = "lib" ; then 
+        host_cpu="lib"
+       AC_MSG_RESULT(no building Lustre library)
+else
 if test -e $LINUX/include/asm-um ; then
 if test  X`ls -id $LINUX/include/asm/ | awk '{print $1}'` = X`ls -id $LINUX/include/asm-um | awk '{print $1}'` ; then
        host_cpu="um";
@@ -10,19 +16,41 @@ fi
 else 
         AC_MSG_RESULT(no (asm-um missing))
 fi
+fi
 
 AC_MSG_CHECKING(setting make flags system architecture: )
 case ${host_cpu} in
+       lib )
+       AC_MSG_RESULT($host_cpu)
+       KCFLAGS='-g -Wall '
+       KCPPFLAGS='-D__arch_lib__ '
+        MOD_LINK=elf_i386
+;;
        um )
        AC_MSG_RESULT($host_cpu)
        KCFLAGS='-g -Wall -pipe -Wno-trigraphs -Wstrict-prototypes -fno-strict-aliasing -fno-common '
-       KCPPFLAGS='-D__KERNEL__ -U__i386__ -Ui386 -DUM_FASTCALL -D__arch_um__ -DSUBARCH="i386" -DNESTING=0 -D_LARGEFILE64_SOURCE  -Derrno=kernel_errno -DPATCHLEVEL=4 -DMODULE -I$(LINUX)/arch/um/include '
+        case ${linux25} in
+                yes )
+                KCPPFLAGS='-D__KERNEL__ -U__i386__ -Ui386 -DUM_FASTCALL -D__arch_um__ -DSUBARCH="i386" -DNESTING=0 -D_LARGEFILE64_SOURCE  -Derrno=kernel_errno -DPATCHLEVEL=4 -DMODULE -I$(LINUX)/arch/um/include -I$(LINUX)/arch/um/kernel/tt/include -O2 -nostdinc -iwithprefix include -DKBUILD_BASENAME=$(MODULE) -DKBUILD_MODNAME=$(MODULE) '
+        ;;
+                * )
+               KCPPFLAGS='-D__KERNEL__ -U__i386__ -Ui386 -DUM_FASTCALL -D__arch_um__ -DSUBARCH="i386" -DNESTING=0 -D_LARGEFILE64_SOURCE  -Derrno=kernel_errno -DPATCHLEVEL=4 -DMODULE -I$(LINUX)/arch/um/include '
+       ;;
+       esac
+
         MOD_LINK=elf_i386
 ;;
        i*86 )
        AC_MSG_RESULT($host_cpu)
         KCFLAGS='-g -O2 -Wall -Wstrict-prototypes -pipe'
-        KCPPFLAGS='-D__KERNEL__ -DMODULE '
+        case ${linux25} in
+                yes )
+               KCPPFLAGS='-D__KERNEL__ -DMODULE -march=i686 -I$(LINUX)/include/asm-i386/mach-default -nostdinc -iwithprefix include ' 
+        ;;
+                * )
+               KCPPFLAGS='-D__KERNEL__ -DMODULE '
+       ;;
+       esac
         MOD_LINK=elf_i386
 ;;
 
@@ -74,6 +102,7 @@ case ${host_cpu} in
 ;;
 esac
 
+if test $host_cpu != lib ; then 
 AC_MSG_CHECKING(for MODVERSIONS)
 if egrep -e 'MODVERSIONS.*1' $LINUX/include/linux/autoconf.h >/dev/null 2>&1;
 then
@@ -92,6 +121,7 @@ else
        SMPFLAG=
        AC_MSG_RESULT(no)
 fi
+fi
 
 CFLAGS="$KCFLAGS $MFLAGS"
 ARCHCPPFLAGS="$KCPPFLAGS"