[Ocfs2-commits] manish commits r1602 - in branches/dlm-glue: . src

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-10-28 16:47:03 -0500 (Thu, 28 Oct 2004)
New Revision: 1602

Modified:
   branches/dlm-glue/Config.make.in
   branches/dlm-glue/configure.in
   branches/dlm-glue/src/Makefile
Log:
Add cluster-support hooks


Modified: branches/dlm-glue/Config.make.in
===================================================================
--- branches/dlm-glue/Config.make.in	2004-10-28 21:34:13 UTC (rev 1601)
+++ branches/dlm-glue/Config.make.in	2004-10-28 21:47:03 UTC (rev 1602)
@@ -54,6 +54,8 @@
 GCCINC = @GCCINC@
 endif
 
+CLUSTERINC = @CLUSTERINC@
+
 HAVE_NPTL = @HAVE_NPTL@
 
 COMPAT_SAFE_WRITE = @COMPAT_SAFE_WRITE@

Modified: branches/dlm-glue/configure.in
===================================================================
--- branches/dlm-glue/configure.in	2004-10-28 21:34:13 UTC (rev 1601)
+++ branches/dlm-glue/configure.in	2004-10-28 21:47:03 UTC (rev 1602)
@@ -82,6 +82,19 @@
   AC_MSG_ERROR(GCC is required)
 fi
 
+AC_MSG_CHECKING(for cluster support headers)
+AC_ARG_WITH(cluster-support, [  --with-cluster-support=dir Path to the cluster support headers [[none]]], clusterinc="$withval", clusterinc="not found")
+AC_MSG_RESULT($clusterinc)
+
+CLUSTERINC=
+if test -f "$clusterinc/dlmcommon.h"; then
+  CLUSTERINC=$clusterinc
+else
+  AC_MSG_ERROR([Cluster support headers not found, please use --with-cluster-support=/path/to/headers])
+fi
+
+AC_SUBST(CLUSTERINC)
+
 AC_MSG_CHECKING(for debugging)
 AC_ARG_ENABLE(debug, [  --enable-debug=[yes/no]         Turn on debugging [default=yes]],,enable_debug=yes)
 OCFS_DEBUG=

Modified: branches/dlm-glue/src/Makefile
===================================================================
--- branches/dlm-glue/src/Makefile	2004-10-28 21:34:13 UTC (rev 1601)
+++ branches/dlm-glue/src/Makefile	2004-10-28 21:47:03 UTC (rev 1602)
@@ -188,8 +188,6 @@
 BASE_DEFINES = -DMODULE -DLINUX -D__KERNEL__ 
 DEFINES += $(BASE_DEFINES) $(GLOBAL_DEFINES)
 
-CLUSTERINC = /home/mfasheh/src/cluster-support/src/
-
 INCLUDES = -I. -I$(KERNELINC) -I$(GCCINC) -I$(CLUSTERINC)
 
 CFLAGS = $(OPTS) $(MACH_CFLAGS) -pipe -nostdinc -fno-strict-aliasing \
@@ -266,7 +264,7 @@
 STAMP_DIR = $(OCFS_SRC_DIR)
 include $(OCFS_SRC_DIR)/../Versioning.make
 
-EXTRA_CFLAGS += $(GLOBAL_DEFINES)
+EXTRA_CFLAGS += $(GLOBAL_DEFINES) -I$(CLUSTERINC)
 
 CFLAGS_$(VERSION_OBJ) += $(VERDEFS)