1 files changed, 23 insertions, 4 deletions

diff --git a/sysutils/heartbeat/files/patch-configure.in b/sysutils/heartbeat/files/patch-configure.in
index fa3c8bcf0cd0..eb918671bd45 100644
--- a/sysutils/heartbeat/files/patch-configure.in
+++ b/sysutils/heartbeat/files/patch-configure.in
@@ -31,7 +31,26 @@
  AC_PROG_CC_STDC
  
  dnl ************************************************************************
-@@ -542,7 +550,7 @@
+@@ -495,18 +503,6 @@
+ AC_LIBLTDL_CONVENIENCE          dnl make libltdl a convenience lib
+ AC_PROG_LIBTOOL
+ 
+-dnl Replacing AC_PROG_LIBTOOL with AC_CHECK_PROG because LIBTOOL
+-dnl was NOT being expanded all the time thus causing things to fail.
+-AC_CHECK_PROGS(LIBTOOL, glibtool libtool libtool15 libtool13)
+-AC_MSG_CHECKING(for glibtool or libtool*)
+-if test x"${LIBTOOL}" = x""; then
+-      FatalMissingThing "libtool" "You need libtool to build heartbeat." \
+-		"You can get the source from ftp://www.gnu.org/pub/gnu/" \
+-      		"or you can locate it via http://www.gnu.org/software/libtool"
+-else
+-      AC_MSG_RESULT($LIBTOOL has been found.)
+-fi
+-
+ AC_CHECK_PROGS(MAKE, gmake make)
+ AC_MSG_CHECKING(for gmake or make)
+ if test x"${MAKE}" = x""; then
+@@ -542,7 +538,7 @@
  AC_PATH_PROGS(MAILCMD, mail, mailx)
  AC_SUBST(MAILCMD)
  AC_DEFINE_UNQUOTED(IFCONFIG, "$IFCONFIG", path to the ifconfig command)
@@ -40,7 +59,7 @@
  AC_PATH_PROGS(GETENT, getent)
  AC_PATH_PROGS(IP2UTIL, ip, /sbin/ip)
  AC_PATH_PROGS(XML2CONFIG, xml2-config)
-@@ -1718,6 +1726,7 @@
+@@ -1718,6 +1714,7 @@
  AC_CHECK_SIZEOF(int)
  AC_CHECK_SIZEOF(long)
  AC_CHECK_SIZEOF(long long)
@@ -48,7 +67,7 @@
  
  AC_ARG_ENABLE([all],
  [  --enable-all Activate ALL features
-@@ -2381,7 +2390,7 @@
+@@ -2381,7 +2378,7 @@
  
  
  AC_MSG_CHECKING(if clock_t is long enough)
@@ -57,7 +76,7 @@
    AC_MSG_RESULT(yes)
    AC_DEFINE(CLOCK_T_IS_LONG_ENOUGH, 1, [Set if CLOCK_T is adequate by itself for the "indefinite future" (>= 100 years)])
  else
-@@ -2393,13 +2402,13 @@
+@@ -2393,13 +2390,13 @@
  dnl	Note: reduce LIBS; in particular, ltdl can cause confusion.
  dnl	Possibly better:  move 'LIBS="$LIBS -lltdl"' from above to beyond here.
  dnl