From 1a4399a9ebbc9449b2c4f581c0047e251daf9430 Mon Sep 17 00:00:00 2001
From: Duncan Laurie <duncan@iceblink.org>
Date: Sat, 14 May 2005 03:37:29 +0000
Subject: [PATCH] conditional compile of ipmievd can go away

---
 ipmitool/configure.in    | 15 +--------------
 ipmitool/src/Makefile.am |  7 +------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/ipmitool/configure.in b/ipmitool/configure.in
index 2b91bb3..0ab7eed 100644
--- a/ipmitool/configure.in
+++ b/ipmitool/configure.in
@@ -73,7 +73,6 @@ solaris*)
 	enable_intf_open=no
 	enable_intf_lipmi=no
 	enable_ipmishell=no
-	enable_ipmievd=yes
 	enable_all_options=no
 	;;
 *cygwin*)
@@ -83,7 +82,6 @@ solaris*)
 	enable_intf_lipmi=no
 	enable_intf_bmc=no
 	enable_ipmishell=no
-	enable_ipmievd=yes
 	;;
 *darwin*)
 	# disable the linux and solaris-specific interfaces
@@ -92,7 +90,6 @@ solaris*)
 	enable_intf_lipmi=no
 	enable_intf_bmc=no
 	enable_ipmishell=no
-	enable_ipmived=yes
 	;;
 esac
 
@@ -277,16 +274,6 @@ if test "x$enable_ipmishell" = "xyes"; then
 	fi
 fi
 
-dnl enable IPMI Event Daemon
-AC_ARG_ENABLE([ipmievd],
-	[AC_HELP_STRING([--enable-ipmievd],
-			[enable IPMI Event daemon [default=auto]])],
-	[], [enable_ipmievd=yes])
-AM_CONDITIONAL(IPMIEVD, [test "x$enable_ipmievd" = "xyes"])
-if test "x$enable_ipmievd" = "xyes"; then
-    AC_SUBST(IPMIEVD_BIN, [ipmievd])
-fi
-
 dnl Enable -Wall -Werror
 AC_ARG_ENABLE([buildcheck],
 	[AC_HELP_STRING([--enable-buildcheck],
@@ -331,6 +318,6 @@ AC_MSG_RESULT([  bmc     : $enable_intf_bmc])
 AC_MSG_RESULT([  lipmi   : $enable_intf_lipmi])
 AC_MSG_RESULT([])
 AC_MSG_RESULT([Extra tools])
-AC_MSG_RESULT([  ipmievd : $enable_ipmievd])
+AC_MSG_RESULT([  ipmievd : yes])
 AC_MSG_RESULT([])
 
diff --git a/ipmitool/src/Makefile.am b/ipmitool/src/Makefile.am
index 738c720..017da34 100644
--- a/ipmitool/src/Makefile.am
+++ b/ipmitool/src/Makefile.am
@@ -40,13 +40,8 @@ MAINTAINERCLEANFILES	= Makefile.in
 ipmitool_SOURCES	= ipmitool.c ipmishell.c
 ipmitool_LDADD		= $(top_builddir)/lib/libipmitool.la plugins/libintf.la
 
-if IPMIEVD
 ipmievd_SOURCES		= ipmievd.c
 ipmievd_LDADD		= $(top_builddir)/lib/libipmitool.la plugins/libintf.la
-endif
-
-EXTRA_DIST		= ipmievd.c
 
 bin_PROGRAMS		= ipmitool
-sbin_PROGRAMS		= @IPMIEVD_BIN@
-EXTRA_PROGRAMS		= ipmitool ipmievd
+sbin_PROGRAMS		= ipmievd