Branch b1_4

[fs/lustre-release.git] / build / autoconf / lustre-build-darwin.m4

diff --git a/build/autoconf/lustre-build-darwin.m4 b/build/autoconf/lustre-build-darwin.m4
index 2045c6c..8b96dfb 100644 (file)
--- a/build/autoconf/lustre-build-darwin.m4
+++ b/build/autoconf/lustre-build-darwin.m4
@@ -62,6 +62,22 @@ EXTRA_KCFLAGS="$EXTRA_KCFLAGS -msoft-float -static"
 EXTRA_KCFLAGS="$EXTRA_KCFLAGS -DKERNEL -DKERNEL_PRIVATE"
 EXTRA_KCFLAGS="$EXTRA_KCFLAGS -DDRIVER_PRIVATE -DAPPLE -DNeXT"
 EXTRA_KCFLAGS="$EXTRA_KCFLAGS -D__KERNEL__ -D__DARWIN__"
+#
+# C flags for Panther/Tiger
+#
+case $target_os in
+        darwin8*)
+                EXTRA_KCFLAGS="$EXTRA_KCFLAGS -D__DARWIN8__"
+       ;;
+        darwin7*)
+                EXTRA_KCFLAGS="$EXTRA_KCFLAGS -D__DARWIN7__"
+        ;;
+esac
+
+#
+# Debugging flags. Remove!
+#
+EXTRA_KCFLAGS="$EXTRA_KCFLAGS -O0 -DMACH_ASSERT=1"
 EXTRA_KLDFLAGS="$EXTRA_KLDFLAGS -static -nostdlib -r"
 EXTRA_KLIBS="-lkmodc++ -lkmod -lcc_kext"
 KMODEXT=""
@@ -69,9 +85,11 @@ KMODEXT=""
 AC_SUBST(EXTRA_KLDFLAGS)
 AC_SUBST(EXTRA_KLIBS)
 
-plistdir='/System/Library/Extensions/$(firstword $(macos_PROGRAMS)).kext/Contents'
+kextdir='/System/Library/Extensions/$(firstword $(macos_PROGRAMS)).kext'
+plistdir='$(kextdir)/Contents'
 macosdir='$(plistdir)/MacOS'
 
+AC_SUBST(kextdir)
 AC_SUBST(plistdir)
 AC_SUBST(macosdir)