LU-1935 scripts: don't generate lustre init script

[fs/lustre-release.git] / lustre / autoconf / lustre-core.m4

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index fae89c8..b319312 100644 (file)
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -211,9 +211,9 @@ fi
 # Quota support. The kernel must support CONFIG_QUOTA.
 #
 AC_DEFUN([LC_QUOTA_CONFIG],
-[LB_LINUX_CONFIG_IM([QUOTA],[AC_DEFINE(HAVE_QUOTA_SUPPORT, 1, [support quota])],[
-       AC_MSG_ERROR([Lustre quota requires that CONFIG_QUOTA is enabled in your kernel.])
-])
+[LB_LINUX_CONFIG_IM([QUOTA],[],[
+        AC_MSG_ERROR([Lustre quota requires that CONFIG_QUOTA is enabled in your kernel.])
+       ])
 ])
 
 # truncate_complete_page() was exported from RHEL5/SLES10, but not in SLES11 SP0 (2.6.27)
@@ -319,7 +319,7 @@ AC_DEFUN([LC_BIT_SPINLOCK_H],
 AC_DEFUN([LC_CONST_ACL_SIZE],
 [AC_MSG_CHECKING([calc acl size])
 tmp_flags="$CFLAGS"
-CFLAGS="$CFLAGS -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -I$LINUX/arch/`echo $target_cpu|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -include $AUTOCONF_HDIR/autoconf.h $EXTRA_KCFLAGS"
+CFLAGS="$CFLAGS -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -I$LINUX/arch/`echo $target_cpu|sed -e 's/powerpc64/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -include $AUTOCONF_HDIR/autoconf.h $EXTRA_KCFLAGS"
 AC_TRY_RUN([
         #define __KERNEL__
         #include <linux/types.h>
@@ -2274,6 +2274,46 @@ LB_LINUX_TRY_COMPILE([
 ])
 
 #
+# LC_OSD_ADDON
+#
+# configure support for optional OSD implementation
+#
+AC_DEFUN([LC_OSD_ADDON],
+[AC_MSG_CHECKING([for osd])
+AC_ARG_WITH([osd],
+       AC_HELP_STRING([--with-osd=path],
+                       [set path to optional osd]),
+        [
+               case $with_osd in
+                       no)     ENABLEOSDADDON=0
+                               ;;
+                       *)      OSDADDON="${with_osd}"
+                               ENABLEOSDADDON=1
+                               ;;
+               esac
+       ], [
+               ENABLEOSDADDON=0
+       ])
+if test $ENABLEOSDADDON -eq 0; then
+       AC_MSG_RESULT([no])
+       OSDADDON=
+else
+       OSDMODNAME=`basename $OSDADDON`
+       if test -e $LUSTRE/$OSDMODNAME; then
+               AC_MSG_RESULT([can't link])
+               OSDADDON=
+       elif ln -s $OSDADDON $LUSTRE/$OSDMODNAME; then
+               AC_MSG_RESULT([$OSDMODNAME])
+               OSDADDON="subdir-m += $OSDMODNAME"
+       else
+               AC_MSG_RESULT([can't link])
+               OSDADDON=
+       fi
+fi
+AC_SUBST(OSDADDON)
+])
+
+#
 # LC_CONFIGURE
 #
 # other configure checks
@@ -2490,13 +2530,14 @@ lustre/ptlrpc/gss/autoMakefile
 lustre/quota/Makefile
 lustre/quota/autoMakefile
 lustre/scripts/Makefile
-lustre/scripts/lustre
 lustre/tests/Makefile
 lustre/tests/mpi/Makefile
 lustre/utils/Makefile
 lustre/utils/gss/Makefile
 lustre/osp/Makefile
 lustre/osp/autoMakefile
+lustre/lod/Makefile
+lustre/lod/autoMakefile
 lustre/obdclass/darwin/Makefile
 ])
 ])