From 6890e1f002408e06d163ec6295de40b28bd6b80a Mon Sep 17 00:00:00 2001
From: Duncan Laurie <duncan@iceblink.org>
Date: Fri, 19 Dec 2003 18:19:19 +0000
Subject: [PATCH] remove ltdl hacks, breaks shared libraries on RHEL3 for some
 reason

---
 ipmitool/Makefile.am  | 4 +---
 ipmitool/bootstrap    | 2 +-
 ipmitool/configure.in | 7 +------
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/ipmitool/Makefile.am b/ipmitool/Makefile.am
index 068e6c6..74f11c0 100644
--- a/ipmitool/Makefile.am
+++ b/ipmitool/Makefile.am
@@ -38,9 +38,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure configure-stamp \
 	config.guess config.sub depcomp install-sh ltmain.sh missing \
 	mkinstalldirs config.h.in stamp-h.in $(distdir).tar.gz
 
-SUBDIRS = libltdl lib src include doc
-
-INCLUDES = $(LTDLINCL)
+SUBDIRS = lib src include doc
 
 dist-hook: ipmitool.spec
 	cp ipmitool.spec $(distdir)
diff --git a/ipmitool/bootstrap b/ipmitool/bootstrap
index a13560a..7c527c5 100755
--- a/ipmitool/bootstrap
+++ b/ipmitool/bootstrap
@@ -35,7 +35,7 @@
 # facility.
 
 aclocal
-libtoolize --automake --copy --ltdl
+libtoolize --automake --copy
 
 autoheader
 automake --foreign --add-missing --copy
diff --git a/ipmitool/configure.in b/ipmitool/configure.in
index d153735..28442a5 100644
--- a/ipmitool/configure.in
+++ b/ipmitool/configure.in
@@ -20,15 +20,10 @@ AC_PROG_MAKE_SET
 
 AC_CHECK_PROG(SED, sed, sed)
 
-dnl setup libtool and ltdl
-AC_LIB_LTDL
+dnl setup libtool
 AC_LIBTOOL_DLOPEN
-AC_LIBLTDL_CONVENIENCE
 AM_PROG_LIBTOOL
 LIBTOOL="$LIBTOOL --silent"
-AC_SUBST(LTDLINCL)
-AC_SUBST(LIBLTDL)
-AC_CONFIG_SUBDIRS(libltdl)
 
 AC_CHECK_LIB([m], [pow], [], [
 	echo "** libm library pow() not found!"