From 0f2c248eeef649fc895a3ca8918d2598c499f270 Mon Sep 17 00:00:00 2001
From: Alasdair Kergon <agk@redhat.com>
Date: Fri, 31 Oct 2008 22:33:55 +0000
Subject: [PATCH] no DMDIR

---
 configure.in |  7 -------
 make.tmpl.in | 11 -----------
 2 files changed, 18 deletions(-)

diff --git a/configure.in b/configure.in
index fc32849d0..d36775c3d 100644
--- a/configure.in
+++ b/configure.in
@@ -611,12 +611,6 @@ AC_ARG_WITH(staticdir,
 	    [ STATICDIR="$withval" ],
 	    [ STATICDIR='${exec_prefix}/sbin' ])
 
-# Convert a relative dir name to absolute.
-case $DMDIR in
-  /*) ;;
-  *) DMDIR="`pwd`/$DMDIR" ;;
-esac
-
 AC_ARG_WITH(usrlibdir,
 	    [  --with-usrlibdir=DIR],
 	    [ usrlibdir="$withval"],
@@ -723,7 +717,6 @@ AC_SUBST(COPTIMISE_FLAG)
 AC_SUBST(CSCOPE_CMD)
 AC_SUBST(DEBUG)
 AC_SUBST(DEVMAPPER)
-AC_SUBST(DMDIR)
 AC_SUBST(DMEVENTD)
 AC_SUBST(DM_COMPAT)
 AC_SUBST(DM_DEVICE_GID)
diff --git a/make.tmpl.in b/make.tmpl.in
index 88b7bfd4c..c5bd2c959 100644
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -80,13 +80,6 @@ ifeq ("@INTL@", "yes")
   DEFS += -DINTL_PACKAGE=\"@INTL_PACKAGE@\" -DLOCALEDIR=\"@LOCALEDIR@\"
 endif
 
-ifneq ("@DMDIR@", "")
-  LDFLAGS += -L@DMDIR@/lib/ioctl
-  ifeq ("@DMEVENTD@", "yes")
-    LDFLAGS += -L@DMDIR@/dmeventd
-  endif
-endif
-
 LDFLAGS += -L$(top_srcdir)/lib -L$(libdir)
 
 #DEFS += -DDEBUG_POOL
@@ -105,10 +98,6 @@ LIB_VERSION := $(shell cat $(top_srcdir)/VERSION | \
 
 INCLUDES += -I$(top_srcdir)/include
 
-ifneq ("@DMDIR@", "")
-  INCLUDES += -I@DMDIR@/include
-endif
-
 ifdef DESTDIR
   INCLUDES += -I$(DESTDIR)/usr/include
 endif