From 96bdede086c3cfd2bca0ba0f98e728de01928e92 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bart.vanassche@sandisk.com>
Date: Wed, 18 Nov 2015 19:36:01 +0000
Subject: [PATCH] scst: Make it easier to build without DLM support

With this change all that is required to build without DLM support
is to add the following in scst_priv.h:

#undef CONFIG_DLM
#undef CONFIG_DLM_MODULE


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6695 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scst/src/Makefile   | 5 -----
 scst/src/scst_dlm.c | 4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/scst/src/Makefile b/scst/src/Makefile
index 51d83b986..ee1501fd0 100644
--- a/scst/src/Makefile
+++ b/scst/src/Makefile
@@ -49,12 +49,7 @@ scst-y        += scst_mem.o
 scst-y        += scst_debug.o
 scst-y        += scst_pres.o
 scst-y        += scst_no_dlm.o
-ifdef CONFIG_DLM
 scst-y        += scst_dlm.o
-endif
-ifdef CONFIG_DLM_MODULE
-scst-y        += scst_dlm.o
-endif
 scst-y        += scst_tg.o
 scst-y        += scst_event.o
 scst-y        += scst_copy_mgr.o
diff --git a/scst/src/scst_dlm.c b/scst/src/scst_dlm.c
index 0aa1372ea..8e9bdc4f5 100644
--- a/scst/src/scst_dlm.c
+++ b/scst/src/scst_dlm.c
@@ -30,6 +30,8 @@
 #include "scst_pres.h"
 #include "scst_dlm.h"
 
+#if defined(CONFIG_DLM) || defined(CONFIG_DLM_MODULE)
+
 static void scst_pr_dlm_cleanup(struct scst_device *dev);
 static void scst_dlm_pre_bast(void *bastarg, int mode);
 static void scst_dlm_post_bast(void *bastarg, int mode);
@@ -1493,3 +1495,5 @@ const struct scst_cl_ops scst_dlm_cl_ops = {
 	.is_not_rsv_holder	= scst_dlm_is_not_rsv_holder,
 	.reserve		= scst_dlm_reserve,
 };
+
+#endif