--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -33,17 +33,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -55,39 +49,79 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = .
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/README.in \
+	$(srcdir)/heartbeat.spec.in $(top_srcdir)/configure \
+	$(top_srcdir)/pkg/InfoFiles/pkginfo.in \
+	$(top_srcdir)/pkg/InfoFiles/postinstall.in \
+	$(top_srcdir)/pkg/InfoFiles/preinstall.in \
+	$(top_srcdir)/port/heartbeat/pkg-deinstall.in \
+	$(top_srcdir)/port/heartbeat/pkg-descr.in \
+	$(top_srcdir)/port/heartbeat/pkg-install.in \
+	$(top_srcdir)/port/heartbeat/pkg-plist.in compile config.guess \
+	config.sub depcomp install-sh ltmain.sh missing mkinstalldirs \
+	py-compile ylwrap
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES = heartbeat.spec README pkg/InfoFiles/pkginfo \
+	pkg/InfoFiles/preinstall pkg/InfoFiles/postinstall \
+	port/heartbeat/pkg-deinstall port/heartbeat/pkg-descr \
+	port/heartbeat/pkg-install port/heartbeat/pkg-plist
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = @LIBLTDL_DIR@ debian pkg port replace include lib \
+	heartbeat membership telecom resources lrm @CRM_DIR@ fencing \
+	logd snmp_subagent tools doc cts mgmt cim ldirectord config \
+	tsa_plugin contrib
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  { test ! -d $(distdir) \
+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr $(distdir); }; }
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -110,8 +144,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -155,8 +187,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -168,6 +198,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -175,12 +206,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -198,8 +225,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -208,15 +233,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -246,8 +268,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -255,7 +275,6 @@
 ROUTE = @ROUTE@
 ROUTEPARM = @ROUTEPARM@
 RPM = @RPM@
-
 RPMREL = @RPMREL@
 RPMTARGET = @RPMTARGET@
 RPM_ENABLE_MGMT_CONFIG = @RPM_ENABLE_MGMT_CONFIG@
@@ -269,8 +288,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -281,20 +298,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -302,17 +307,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -320,6 +327,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -341,6 +349,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -355,13 +364,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 EXTRA_DIST = bootstrap rc.config.heartbeat 	\
 			heartbeat.spec.in heartbeat.spec	\
 			ConfigureMe README.in libltdl.tar
@@ -378,84 +389,67 @@
 RPMldir = $(DESTDIR)$(RPMDIR)/RPMS/i586/$(PACKAGE)-ldirectord-$(VERSION)-$(RPMREL).i586.rpm
 SHAREDIR = @HA_DATADIR@
 HBSHAREDIR = @HA_NOARCHDATAHBDIR@
-
 ALL_RPMS = $(RPMSRC) $(RPM386) $(RPMstonith) $(RPMldir) $(RPMpils)
-
 AUTOMAKE_OPTIONS = foreign
-
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure DRF/config-h.in \
                         DRF/stamp-h.in libtool.m4 ltdl.m4 libltdl.tar
 
 coredir = @HA_COREDIR@
 hauser = @HA_CCMUSER@
-
 @SNMP_SUBAGENT_BUILD_TRUE@SNMP_SUBAGENT_DIR = snmp_subagent
-
 @MGMT_BUILD_TRUE@MGMT_DIR = mgmt
-
 @CIM_PROVIDER_BUILD_TRUE@CIM_PROVIDER_DIR = cim
-
 @TSA_PLUGIN_BUILD_TRUE@TSA_PLUGIN_DIR = tsa_plugin
-
 @LDIRECTORD_BUILD_TRUE@LDIRECTORD_DIR = ldirectord
-
 SUBDIRS = $(LIBLTDL_DIR) debian pkg port replace include lib            \
           heartbeat membership telecom resources lrm $(CRM_DIR)		\
           fencing logd $(SNMP_SUBAGENT_DIR) tools doc cts $(MGMT_DIR)   \
           $(CIM_PROVIDER_DIR) $(LDIRECTORD_DIR) config $(TSA_PLUGIN_DIR) contrib 
 
-
 HANDY_DOCS = doc/ChangeLog doc/GettingStarted.html doc/DirectoryMap.txt
 HBDOCS = doc/heartbeat_api.html
 
 # Pass these to configure when running "make distcheck"
 DISTCHECK_CONFIGURE_FLAGS = --with-initdir=prefix
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES = heartbeat.spec README pkg/InfoFiles/pkginfo \
-	pkg/InfoFiles/preinstall pkg/InfoFiles/postinstall \
-	port/heartbeat/pkg-deinstall port/heartbeat/pkg-descr \
-	port/heartbeat/pkg-install port/heartbeat/pkg-plist
-DIST_SOURCES =
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/configure Makefile.am \
-	README.in acinclude.m4 aclocal.m4 compile config.guess \
-	config.sub configure.in depcomp heartbeat.spec.in install-sh \
-	ltmain.sh missing mkinstalldirs py-compile
-DIST_SUBDIRS = @LIBLTDL_DIR@ debian pkg port replace include lib \
-	heartbeat membership telecom resources lrm @CRM_DIR@ fencing \
-	logd snmp_subagent tools doc cts mgmt cim ldirectord config \
-	tsa_plugin contrib
 all: all-recursive
 
 .SUFFIXES:
-
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+am--refresh:
+	@:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
+	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	esac;
 
-$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
-$(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
 
-$(ACLOCAL_M4):  configure.in acinclude.m4
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-heartbeat.spec: $(top_builddir)/config.status heartbeat.spec.in
+heartbeat.spec: $(top_builddir)/config.status $(srcdir)/heartbeat.spec.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-README: $(top_builddir)/config.status README.in
+README: $(top_builddir)/config.status $(srcdir)/README.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 pkg/InfoFiles/pkginfo: $(top_builddir)/config.status $(top_srcdir)/pkg/InfoFiles/pkginfo.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
@@ -480,7 +474,6 @@
 
 distclean-libtool:
 	-rm -f libtool
-uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -489,7 +482,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -501,15 +500,20 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -530,7 +534,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -541,14 +545,6 @@
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -557,19 +553,22 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -579,10 +578,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -605,40 +605,25 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = .
-distdir = $(PACKAGE)-$(VERSION)
-
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(mkinstalldirs) $(distdir)/. $(distdir)/cim/mof $(distdir)/crm/admin $(distdir)/cts $(distdir)/doc $(distdir)/fencing/test $(distdir)/heartbeat $(distdir)/heartbeat/init.d $(distdir)/heartbeat/lib $(distdir)/heartbeat/rc.d $(distdir)/include/pils $(distdir)/ldirectord $(distdir)/ldirectord/OCF $(distdir)/ldirectord/init.d $(distdir)/lib/plugins/stonith $(distdir)/lib/plugins/stonith/external $(distdir)/lrm/test $(distdir)/mgmt/client $(distdir)/pkg/InfoFiles $(distdir)/port $(distdir)/port/heartbeat $(distdir)/resources/OCF $(distdir)/resources/heartbeat $(distdir)/snmp_subagent $(distdir)/tools $(distdir)/tsa_plugin
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	test -d $(distdir) || mkdir $(distdir)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -651,13 +636,17 @@
 	done
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -665,22 +654,49 @@
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
 dist-gzip: distdir
-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+
+dist-bzip2: distdir
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist-tarZ: distdir
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	$(am__remove_distdir)
+
+dist-shar: distdir
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	$(am__remove_distdir)
+
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
 	$(am__remove_distdir)
 
 dist dist-all: distdir
-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
 # tarfile.
 distcheck: dist
-	$(am__remove_distdir)
-	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+	case '$(DIST_ARCHIVES)' in \
+	*.tar.gz*) \
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	*.tar.bz2*) \
+	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.Z*) \
+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+	*.shar.gz*) \
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	*.zip*) \
+	  unzip $(distdir).zip ;;\
+	esac
 	chmod -R a-w $(distdir); chmod a+w $(distdir)
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
@@ -700,19 +716,20 @@
 	        distuninstallcheck \
 	  && chmod -R a-w "$$dc_install_base" \
 	  && ({ \
-	       (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
 	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
 	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
 	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
-	  && rm -f $(distdir).tar.gz \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	  && rm -rf $(DIST_ARCHIVES) \
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
 	$(am__remove_distdir)
-	@echo "$(distdir).tar.gz is ready for distribution" | \
-	  sed 'h;s/./=/g;p;x;p;x'
+	@(echo "$(distdir) archives ready for distribution: "; \
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
 	@cd $(distuninstallcheck_dir) \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -736,7 +753,6 @@
 all-am: Makefile
 installdirs: installdirs-recursive
 installdirs-am:
-
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -756,7 +772,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -776,18 +792,28 @@
 
 dvi-am:
 
+html: html-recursive
+
 info: info-recursive
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am: install-exec-local
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -809,28 +835,27 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive dist dist-all dist-gzip distcheck distclean \
-	distclean-generic distclean-libtool distclean-recursive \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am dvi-recursive info info-am info-recursive install \
-	install-am install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-local \
-	install-exec-recursive install-info install-info-am \
-	install-info-recursive install-man install-recursive \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am am--refresh check check-am clean clean-generic \
+	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
+	distclean-generic distclean-libtool distclean-tags \
+	distcleancheck distdir distuninstallcheck dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-exec-local install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
-	installdirs-am installdirs-recursive maintainer-clean \
-	maintainer-clean-generic maintainer-clean-local \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-recursive
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	maintainer-clean-local mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
 
 
 rpm:		dist
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,3809 +11,4071 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-dnl
-dnl local autoconf/automake macros needed for heartbeat
-dnl	Started by David Lee <t.d.lee@durham.ac.uk> February 2006
-dnl
-dnl License: GNU General Public License (GPL)
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf.  If you want to use that,
+you should regenerate the build system entirely.], [63])])
 
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-dnl AM_CHECK_PYTHON_HEADERS:  Find location of python include files.
-dnl Taken from:
-dnl	http://source.macgimp.org/
-dnl which is GPL and is attributed to James Henstridge.
-dnl
-dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
-dnl Imports:
-dnl	$PYTHON
-dnl Exports:
-dnl	PYTHON_INCLUDES
-
-AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
-[AC_REQUIRE([AM_PATH_PYTHON])
-AC_MSG_CHECKING(for headers required to compile python extensions)
-dnl deduce PYTHON_INCLUDES
-py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
-py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
-if test "$py_prefix" != "$py_exec_prefix"; then
-  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
-fi
-AC_SUBST(PYTHON_INCLUDES)
-dnl check if the headers exist:
-save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
-AC_TRY_CPP([#include <Python.h>],dnl
-[AC_MSG_RESULT(found)
-$1],dnl
-[AC_MSG_RESULT(not found)
-$2])
-CPPFLAGS="$save_CPPFLAGS"
-])
+# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL
 
 
-# Copyright 1999, 2000, 2001, 2002, 2003  Free Software Foundation, Inc.
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# -----------------------------------------------------------
+# If this macro is not defined by Autoconf, define it here.
+m4_ifdef([AC_PROVIDE_IFELSE],
+         [],
+         [m4_define([AC_PROVIDE_IFELSE],
+	         [m4_ifdef([AC_PROVIDE_$1],
+		           [$2], [$3])])])
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# AC_PROG_LIBTOOL
+# ---------------
+AC_DEFUN([AC_PROG_LIBTOOL],
+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+  AC_PROVIDE_IFELSE([AC_PROG_CXX],
+    [AC_LIBTOOL_CXX],
+    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+  ])])
+dnl And a similar setup for Fortran 77 support
+  AC_PROVIDE_IFELSE([AC_PROG_F77],
+    [AC_LIBTOOL_F77],
+    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+])])
 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+    [AC_LIBTOOL_GCJ],
+    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+      [AC_LIBTOOL_GCJ],
+      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+	[AC_LIBTOOL_GCJ],
+      [ifdef([AC_PROG_GCJ],
+	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([A][M_PROG_GCJ],
+	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([LT_AC_PROG_GCJ],
+	     [define([LT_AC_PROG_GCJ],
+		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+])])# AC_PROG_LIBTOOL
 
-# AM_PATH_PYTHON([MINIMUM-VERSION])
 
-# Adds support for distributing Python modules and packages.  To
-# install modules, copy them to $(pythondir), using the python_PYTHON
-# automake variable.  To install a package with the same name as the
-# automake package, install to $(pkgpythondir), or use the
-# pkgpython_PYTHON automake variable.
+# _AC_PROG_LIBTOOL
+# ----------------
+AC_DEFUN([_AC_PROG_LIBTOOL],
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
 
-# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as
-# locations to install python extension modules (shared libraries).
-# Another macro is required to find the appropriate flags to compile
-# extension modules.
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
 
-# If your package is configured with a different prefix to python,
-# users will have to add the install directory to the PYTHONPATH
-# environment variable, or create a .pth file (see the python
-# documentation for details).
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
 
-# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will
-# cause an error if the version of python installed on the system
-# doesn't meet the requirement.  MINIMUM-VERSION should consist of
-# numbers and dots only.
+# Prevent multiple expansion
+define([AC_PROG_LIBTOOL], [])
+])# _AC_PROG_LIBTOOL
 
-AC_DEFUN([AM_PATH_PYTHON],
- [
-  dnl Find a Python interpreter.  Python versions prior to 1.5 are not
-  dnl supported because the default installation locations changed from
-  dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages
-  dnl in 1.5.
-  m4_define([_AM_PYTHON_INTERPRETER_LIST],
-	    [python python2 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5])
 
-  m4_if([$1],[],[
-    dnl No version check is needed.
-    # Find any Python interpreter.
-    AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST)
-    am_display_PYTHON=python
-  ], [
-    dnl A version check is needed.
-    if test -n "$PYTHON"; then
-      # If the user set $PYTHON, use it and don't search something else.
-      AC_MSG_CHECKING([whether $PYTHON version >= $1])
-      AM_PYTHON_CHECK_VERSION([$PYTHON], [$1],
-			      [AC_MSG_RESULT(yes)],
-			      [AC_MSG_ERROR(too old)])
-    else
-      # Otherwise, try each interpreter until we find one that satisfies
-      # VERSION.
-      AC_CACHE_CHECK([for a Python interpreter with version >= $1],
-	[am_cv_pathless_PYTHON],[
-	for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST : ; do
-          if test "$am_cv_pathless_PYTHON" = : ; then
-            AC_MSG_ERROR([no suitable Python interpreter found])
-	  fi
-          AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break])
-        done])
-      # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
-      AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON])
-      am_display_PYTHON=$am_cv_pathless_PYTHON
-    fi
-  ])
+# AC_LIBTOOL_SETUP
+# ----------------
+AC_DEFUN([AC_LIBTOOL_SETUP],
+[AC_PREREQ(2.50)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
 
-  dnl Query Python for its version number.  Getting [:3] seems to be
-  dnl the best way to do this; it's what "site.py" does in the standard
-  dnl library.
+AC_REQUIRE([AC_PROG_LN_S])dnl
+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+AC_REQUIRE([AC_OBJEXT])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
+dnl
 
-  AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
-    [am_cv_python_version=`$PYTHON -c "import sys; print sys.version[[:3]]"`])
-  AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
+AC_LIBTOOL_SYS_MAX_CMD_LEN
+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+AC_LIBTOOL_OBJDIR
 
-  dnl Use the values of $prefix and $exec_prefix for the corresponding
-  dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX.  These are made
-  dnl distinct variables so they can be overridden if need be.  However,
-  dnl general consensus is that you shouldn't need this ability.
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+_LT_AC_PROG_ECHO_BACKSLASH
 
-  AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
-  AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
 
-  dnl At times (like when building shared libraries) you may want
-  dnl to know which OS platform Python thinks this is.
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e 1s/^X//'
+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
 
-  AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],
-    [am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`])
-  AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
+# Same as above, but do not quote variable references.
+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
 
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
 
-  dnl Set up 4 directories:
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
 
-  dnl pythondir -- where to install python scripts.  This is the
-  dnl   site-packages directory, not the python standard library
-  dnl   directory like in previous automake betas.  This behavior
-  dnl   is more consistent with lispdir.m4 for example.
-  dnl Query distutils for this directory.  distutils does not exist in
-  dnl Python 1.5, so we fall back to the hardcoded directory if it
-  dnl doesn't work.
-  AC_CACHE_CHECK([for $am_display_PYTHON script directory],
-    [am_cv_python_pythondir],
-    [am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
-     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`])
-  AC_SUBST([pythondir], [$am_cv_python_pythondir])
+# Constants:
+rm="rm -f"
 
-  dnl pkgpythondir -- $PACKAGE directory under pythondir.  Was
-  dnl   PYTHON_SITE_PACKAGE in previous betas, but this naming is
-  dnl   more consistent with the rest of automake.
+# Global variables:
+default_ofile=libtool
+can_build_shared=yes
 
-  AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE])
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+ltmain="$ac_aux_dir/ltmain.sh"
+ofile="$default_ofile"
+with_gnu_ld="$lt_cv_prog_gnu_ld"
 
-  dnl pyexecdir -- directory for installing python extension modules
-  dnl   (shared libraries)
-  dnl Query distutils for this directory.  distutils does not exist in
-  dnl Python 1.5, so we fall back to the hardcoded directory if it
-  dnl doesn't work.
-  AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
-    [am_cv_python_pyexecdir],
-    [am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
-     echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`])
-  AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
+AC_CHECK_TOOL(AR, ar, false)
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+AC_CHECK_TOOL(STRIP, strip, :)
 
-  dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
 
-  AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE])
-])
+# Set sane defaults for various variables
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$AS" && AS=as
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+test -z "$LD" && LD=ld
+test -z "$LN_S" && LN_S="ln -s"
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+test -z "$NM" && NM=nm
+test -z "$SED" && SED=sed
+test -z "$OBJDUMP" && OBJDUMP=objdump
+test -z "$RANLIB" && RANLIB=:
+test -z "$STRIP" && STRIP=:
+test -z "$ac_objext" && ac_objext=o
 
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
 
-# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
-# ---------------------------------------------------------------------------
-# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION.
-# Run ACTION-IF-FALSE otherwise.
-# This test uses sys.hexversion instead of the string equivalent (first
-# word of sys.version), in order to cope with versions such as 2.2c1.
-# hexversion has been introduced in Python 1.5.2; it's probably not
-# worth to support older versions (1.5.1 was released on October 31, 1998).
-AC_DEFUN([AM_PYTHON_CHECK_VERSION],
- [prog="import sys, string
-# split strings by '.' and convert to numeric.  Append some zeros
-# because we need at least 4 digits for the hex conversion.
-minver = map(int, string.split('$2', '.')) + [[0, 0, 0]]
-minverhex = 0
-for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[[i]]
-sys.exit(sys.hexversion < minverhex)"
-  AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
-
-# Copyright 2001 Free Software Foundation, Inc.             -*- Autoconf -*-
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+_LT_CC_BASENAME([$compiler])
 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# Only perform the check for file, if the check method requires it
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    AC_PATH_MAGIC
+  fi
+  ;;
+esac
 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+enable_win32_dll=yes, enable_win32_dll=no)
 
-# AM_RUN_LOG(COMMAND)
-# -------------------
-# Run COMMAND, save the exit status in ac_status, and log it.
-# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
-AC_DEFUN([AM_RUN_LOG],
-[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
-   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   (exit $ac_status); }])
+AC_ARG_ENABLE([libtool-lock],
+    [AC_HELP_STRING([--disable-libtool-lock],
+	[avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 
-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
+AC_ARG_WITH([pic],
+    [AC_HELP_STRING([--with-pic],
+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [pic_mode="$withval"],
+    [pic_mode=default])
+test -z "$pic_mode" && pic_mode=default
 
-# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
+# Use C for the default configuration in the libtool script
+tagname=
+AC_LIBTOOL_LANG_C_CONFIG
+_LT_AC_TAGCONFIG
+])# AC_LIBTOOL_SETUP
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# _LT_AC_SYS_COMPILER
+# -------------------
+AC_DEFUN([_LT_AC_SYS_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
 
-AC_PREREQ([2.52])
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 
-# serial 6
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_AC_SYS_COMPILER
 
-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
 
-# Do all the work for Automake.                            -*- Autoconf -*-
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+AC_DEFUN([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+])
 
-# This macro actually does too much some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+])# _LT_COMPILER_BOILERPLATE
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+AC_DEFUN([_LT_LINKER_BOILERPLATE],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+])# _LT_LINKER_BOILERPLATE
 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
 
-# serial 10
+# _LT_AC_SYS_LIBPATH_AIX
+# ----------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+])# _LT_AC_SYS_LIBPATH_AIX
 
-AC_PREREQ([2.54])
 
-# Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
-# the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+# _LT_AC_SHELL_INIT(ARG)
+# ----------------------
+AC_DEFUN([_LT_AC_SHELL_INIT],
+[ifdef([AC_DIVERSION_NOTICE],
+	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+	 [AC_DIVERT_PUSH(NOTICE)])
+$1
+AC_DIVERT_POP
+])# _LT_AC_SHELL_INIT
 
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
- AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
 
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
+# _LT_AC_PROG_ECHO_BACKSLASH
+# --------------------------
+# Add some code to the start of the generated configure script which
+# will find an echo command which doesn't interpret backslashes.
+AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
+[_LT_AC_SHELL_INIT([
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
 
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+case X$ECHO in
+X*--fallback-echo)
+  # Remove one level of quotation (which was required for Make).
+  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+  ;;
+esac
 
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+echo=${ECHO-echo}
+if test "X[$]1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X[$]1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
+  # Yippee, $echo works!
+  :
+else
+  # Restart under the correct shell.
+  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+fi
 
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_MISSING_PROG(AMTAR, tar)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+if test "X[$]1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+[$]*
+EOF
+  exit 0
+fi
 
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
-])
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+if test -z "$ECHO"; then
+if test "X${echo_test_string+set}" != Xset; then
+# find a string as large as possible, as long as the shell can cope with it
+  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+       echo_test_string=`eval $cmd` &&
+       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+    then
+      break
+    fi
+  done
+fi
 
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+   test "X$echo_testing_string" = "X$echo_test_string"; then
+  :
+else
+  # The Solaris, AIX, and Digital Unix default echo programs unquote
+  # backslashes.  This makes it impossible to quote backslashes using
+  #   echo "$something" | sed 's/\\/\\\\/g'
+  #
+  # So, first we look for a working echo in the user's PATH.
 
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $1 | $1:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for dir in $PATH /usr/ucb; do
+    IFS="$lt_save_ifs"
+    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      echo="$dir/echo"
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
 
-# Copyright 2002  Free Software Foundation, Inc.
+  if test "X$echo" = Xecho; then
+    # We didn't find a better echo, so look for alternatives.
+    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      # This shell has a builtin print -r that does the trick.
+      echo='print -r'
+    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
+	 test "X$CONFIG_SHELL" != X/bin/ksh; then
+      # If we have ksh, try running configure again with it.
+      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+      export ORIGINAL_CONFIG_SHELL
+      CONFIG_SHELL=/bin/ksh
+      export CONFIG_SHELL
+      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+    else
+      # Try using printf.
+      echo='printf %s\n'
+      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+	 test "X$echo_testing_string" = "X$echo_test_string"; then
+	# Cool, printf works
+	:
+      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	   test "X$echo_testing_string" = 'X\t' &&
+	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+	export CONFIG_SHELL
+	SHELL="$CONFIG_SHELL"
+	export SHELL
+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	   test "X$echo_testing_string" = 'X\t' &&
+	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+      else
+	# maybe with a smaller string...
+	prev=:
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
+	  then
+	    break
+	  fi
+	  prev="$cmd"
+	done
 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+	if test "$prev" != 'sed 50q "[$]0"'; then
+	  echo_test_string=`eval $prev`
+	  export echo_test_string
+	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+	else
+	  # Oops.  We lost completely, so just stick with echo.
+	  echo=echo
+	fi
+      fi
+    fi
+  fi
+fi
+fi
 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+ECHO=$echo
+if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+fi
 
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
+AC_SUBST(ECHO)
+])])# _LT_AC_PROG_ECHO_BACKSLASH
 
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.7.9])])
 
-# Helper functions for option handling.                    -*- Autoconf -*-
+# _LT_AC_LOCK
+# -----------
+AC_DEFUN([_LT_AC_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+    [AC_HELP_STRING([--disable-libtool-lock],
+	[avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 
-# Copyright 2001, 2002  Free Software Foundation, Inc.
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+    *ELF-32*)
+      HPUX_IA64_MODE="32"
+      ;;
+    *ELF-64*)
+      HPUX_IA64_MODE="64"
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+   if test "$lt_cv_prog_gnu_ld" = yes; then
+    case `/usr/bin/file conftest.$ac_objext` in
+    *32-bit*)
+      LD="${LD-ld} -melf32bsmip"
+      ;;
+    *N32*)
+      LD="${LD-ld} -melf32bmipn32"
+      ;;
+    *64-bit*)
+      LD="${LD-ld} -melf64bmip"
+      ;;
+    esac
+   else
+    case `/usr/bin/file conftest.$ac_objext` in
+    *32-bit*)
+      LD="${LD-ld} -32"
+      ;;
+    *N32*)
+      LD="${LD-ld} -n32"
+      ;;
+    *64-bit*)
+      LD="${LD-ld} -64"
+      ;;
+    esac
+   fi
+  fi
+  rm -rf conftest*
+  ;;
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *32-bit*)
+      case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_i386_fbsd"
+          ;;
+        x86_64-*linux*)
+          LD="${LD-ld} -m elf_i386"
+          ;;
+        ppc64-*linux*|powerpc64-*linux*)
+          LD="${LD-ld} -m elf32ppclinux"
+          ;;
+        s390x-*linux*)
+          LD="${LD-ld} -m elf_s390"
+          ;;
+        sparc64-*linux*)
+          LD="${LD-ld} -m elf32_sparc"
+          ;;
+      esac
+      ;;
+    *64-bit*)
+      case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_x86_64_fbsd"
+          ;;
+        x86_64-*linux*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        ppc*-*linux*|powerpc*-*linux*)
+          LD="${LD-ld} -m elf64ppc"
+          ;;
+        s390*-*linux*)
+          LD="${LD-ld} -m elf64_s390"
+          ;;
+        sparc*-*linux*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_LANG_PUSH(C)
+     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LANG_POP])
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+sparc*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      *)    LD="${LD-ld} -64" ;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+  ])
+esac
 
-# serial 2
+need_locks="$enable_libtool_lock"
 
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+])# _LT_AC_LOCK
 
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
 
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
+[AC_REQUIRE([LT_AC_PROG_SED])
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       $2=yes
+     fi
+   fi
+   $rm conftest*
+])
 
-# serial 3
+if test x"[$]$2" = xyes; then
+    ifelse([$5], , :, [$5])
+else
+    ifelse([$6], , :, [$6])
+fi
+])# AC_LIBTOOL_COMPILER_OPTION
 
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
 
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
+# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                          [ACTION-SUCCESS], [ACTION-FAILURE])
+# ------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $3"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
+     else
+       $2=yes
+     fi
    fi
+   $rm conftest*
+   LDFLAGS="$save_LDFLAGS"
+])
 
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
+if test x"[$]$2" = xyes; then
+    ifelse([$4], , :, [$4])
 else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
+    ifelse([$5], , :, [$5])
 fi
-AC_MSG_RESULT(yes)])
-
-#  -*- Autoconf -*-
+])# AC_LIBTOOL_LINKER_OPTION
 
 
-# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
+# AC_LIBTOOL_SYS_MAX_CMD_LEN
+# --------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
+[# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring="ABCD"
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+  cygwin* | mingw*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
 
-# serial 3
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
 
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
 
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
 
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+	       = "XX$teststring") >/dev/null 2>&1 &&
+	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
+	      lt_cv_sys_max_cmd_len=$new_result &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on massive
+      # amounts of additional arguments before passing them to the linker.
+      # It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+])
+if test -n $lt_cv_sys_max_cmd_len ; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
 else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
+  AC_MSG_RESULT(none)
 fi
-])
-
-# AM_AUX_DIR_EXPAND
+])# AC_LIBTOOL_SYS_MAX_CMD_LEN
 
-# Copyright 2001 Free Software Foundation, Inc.
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+# _LT_AC_CHECK_DLFCN
+# ------------------
+AC_DEFUN([_LT_AC_CHECK_DLFCN],
+[AC_CHECK_HEADERS(dlfcn.h)dnl
+])# _LT_AC_CHECK_DLFCN
 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-# Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])
-
-AC_DEFUN([AM_AUX_DIR_EXPAND], [
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-
-# Copyright 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ---------------------------------------------------------------------
+AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+if test "$cross_compiling" = yes; then :
+  [$4]
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<EOF
+[#line __oline__ "configure"
+#include "confdefs.h"
 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
 
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
+#include <stdio.h>
 
-# AM_PROG_INSTALL_STRIP
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
 
-# Copyright 2001 Free Software Foundation, Inc.
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
 
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
+    exit (status);
+}]
+EOF
+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_dlunknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
+rm -fr conftest*
+])# _LT_AC_TRY_DLOPEN_SELF
 
-#                                                          -*- Autoconf -*-
-# Copyright (C) 2003  Free Software Foundation, Inc.
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+# AC_LIBTOOL_DLOPEN_SELF
+# ----------------------
+AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+  mingw* | pw32*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+   ;;
 
-# serial 1
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+   ;;
 
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
+  darwin*)
+  # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+   ;;
 
-# serial 5						-*- Autoconf -*-
+  *)
+    AC_CHECK_FUNC([shl_load],
+	  [lt_cv_dlopen="shl_load"],
+      [AC_CHECK_LIB([dld], [shl_load],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+	[AC_CHECK_FUNC([dlopen],
+	      [lt_cv_dlopen="dlopen"],
+	  [AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+	    [AC_CHECK_LIB([svld], [dlopen],
+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+	      [AC_CHECK_LIB([dld], [dld_link],
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+	      ])
+	    ])
+	  ])
+	])
+      ])
+    ;;
+  esac
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003  Free Software Foundation, Inc.
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+    save_LDFLAGS="$LDFLAGS"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
 
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+	  lt_cv_dlopen_self, [dnl
+	  _LT_AC_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
 
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+    	  lt_cv_dlopen_self_static, [dnl
+	  _LT_AC_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
 
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
 
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
 
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+])# AC_LIBTOOL_DLOPEN_SELF
 
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      : > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
+# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
+# ---------------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler
+AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $rm -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+     fi
+   fi
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
+   cd ..
+   rmdir conftest
+   $rm conftest*
 ])
+])# AC_LIBTOOL_PROG_CC_C_O
 
 
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
+# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
+# -----------------------------------------
+# Check to see if we can do hard links to lock some files if needed
+AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
+[AC_REQUIRE([_LT_AC_LOCK])dnl
 
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking Speeds up one-time builds
-  --enable-dependency-tracking  Do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
+hard_links="nottested"
+if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  hard_links=yes
+  $rm conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test "$hard_links" = no; then
+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
 fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
-])
-
-# Generate code to set up dependency tracking.   -*- Autoconf -*-
-
-# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# AC_LIBTOOL_OBJDIR
+# -----------------
+AC_DEFUN([AC_LIBTOOL_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+])# AC_LIBTOOL_OBJDIR
 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
 
-#serial 2
+# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
+# ----------------------------------------------
+# Check hardcoding attributes.
+AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_AC_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
+   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
 
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
+  # We can hardcode non-existant directories.
+  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
+    # Linking always hardcodes the temporary library directory.
+    _LT_AC_TAGVAR(hardcode_action, $1)=relink
   else
-    continue
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
   fi
-  grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
-  # Extract the definition of DEP_FILES from the Makefile without
-  # running `make'.
-  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n -e '/^U = / s///p' < "$mf"`
-  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-  # We invoke sed twice because it is the simplest approach to
-  # changing $(DEPDIR) to its actual value in the expansion.
-  for file in `sed -n -e '
-    /^DEP_FILES = .*\\\\$/ {
-      s/^DEP_FILES = //
-      :loop
-	s/\\\\$//
-	p
-	n
-	/\\\\$/ b loop
-      p
-    }
-    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Check to see how 'make' treats includes.	-*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
 
-# serial 2
 
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
+# AC_LIBTOOL_SYS_LIB_STRIP
+# ------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
+[striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  AC_MSG_RESULT([yes])
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+   darwin*)
+       if test -n "$STRIP" ; then
+         striplib="$STRIP -x"
+         old_striplib="$STRIP -S"
+         AC_MSG_RESULT([yes])
+       else
+  AC_MSG_RESULT([no])
 fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
+       ;;
+   *)
+  AC_MSG_RESULT([no])
+    ;;
+  esac
 fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# AM_CONDITIONAL                                              -*- Autoconf -*-
-
-# Copyright 1997, 2000, 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 5
+])# AC_LIBTOOL_SYS_LIB_STRIP
 
-AC_PREREQ(2.52)
 
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-        [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
+# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+m4_if($1,[],[
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`echo $lt_search_path_spec`
 else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.])
-fi])])
-
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
+need_lib_prefix=unknown
+hardcode_into_libs=no
 
-# Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+aix4* | aix5*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[[01]] | aix4.[[01]].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
 
-# serial 3
+amigaos*)
+  library_names_spec='$libname.ixlibrary $libname.a'
+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+  ;;
 
-AC_PREREQ(2.50)
-
-# AM_PROG_LEX
-# -----------
-# Autoconf leaves LEX=: if lex or flex can't be found.  Change that to a
-# "missing" invocation, for better error output.
-AC_DEFUN([AM_PROG_LEX],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
-AC_REQUIRE([AC_PROG_LEX])dnl
-if test "$LEX" = :; then
-  LEX=${am_missing_run}flex
-fi])
-
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-
-# serial 48 AC_PROG_LIBTOOL
-
-
-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-# -----------------------------------------------------------
-# If this macro is not defined by Autoconf, define it here.
-m4_ifdef([AC_PROVIDE_IFELSE],
-         [],
-         [m4_define([AC_PROVIDE_IFELSE],
-	         [m4_ifdef([AC_PROVIDE_$1],
-		           [$2], [$3])])])
-
-
-# AC_PROG_LIBTOOL
-# ---------------
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-  ])])
-dnl And a similar setup for Fortran 77 support
-  AC_PROVIDE_IFELSE([AC_PROG_F77],
-    [AC_LIBTOOL_F77],
-    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-      [AC_LIBTOOL_GCJ],
-      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	[AC_LIBTOOL_GCJ],
-      [ifdef([AC_PROG_GCJ],
-	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-       ifdef([A][M_PROG_GCJ],
-	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-       ifdef([LT_AC_PROG_GCJ],
-	     [define([LT_AC_PROG_GCJ],
-		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-])])# AC_PROG_LIBTOOL
-
-
-# _AC_PROG_LIBTOOL
-# ----------------
-AC_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
 
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+bsdi[[45]]*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
 
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
+cygwin* | mingw* | pw32*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
 
-# Prevent multiple expansion
-define([AC_PROG_LIBTOOL], [])
-])# _AC_PROG_LIBTOOL
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $rm \$dlpath'
+    shlibpath_overrides_runpath=yes
 
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      ;;
+    mingw*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    ;;
 
-# AC_LIBTOOL_SETUP
-# ----------------
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.50)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
 
-AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-dnl
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+  m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) 
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
 
-AC_LIBTOOL_SYS_MAX_CMD_LEN
-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-AC_LIBTOOL_OBJDIR
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
 
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-_LT_AC_PROG_ECHO_BACKSLASH
+freebsd1*)
+  dynamic_linker=no
+  ;;
 
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[123]]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
   fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
   ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
-
-# Same as above, but do not quote variable references.
-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
 
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Constants:
-rm="rm -f"
-
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-AC_CHECK_TOOL(AR, ar, false)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
 
-# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
-test -z "$ac_objext" && ac_objext=o
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+   hppa*64*)
+     shrext_cmds='.sl'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+   *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
 
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
+interix[[3-9]]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
 
-if test -n "$RANLIB"; then
+irix5* | irix6* | nonstopux*)
   case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
   ;;
-esac
-
-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-enable_win32_dll=yes, enable_win32_dll=no)
-
-AC_ARG_ENABLE([libtool-lock],
-    [AC_HELP_STRING([--disable-libtool-lock],
-	[avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 
-AC_ARG_WITH([pic],
-    [AC_HELP_STRING([--with-pic],
-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
-    [pic_mode=default])
-test -z "$pic_mode" && pic_mode=default
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
 
-# Use C for the default configuration in the libtool script
-tagname=
-AC_LIBTOOL_LANG_C_CONFIG
-_LT_AC_TAGCONFIG
-])# AC_LIBTOOL_SETUP
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
 
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
 
-# _LT_AC_SYS_COMPILER
-# -------------------
-AC_DEFUN([_LT_AC_SYS_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
 
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
 
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
 
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_AC_SYS_COMPILER
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
 
+nto-qnx*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
 
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-AC_DEFUN([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
   esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-])
-
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[[89]] | openbsd2.[[89]].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
 
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-])# _LT_COMPILER_BOILERPLATE
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
 
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
 
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
-])# _LT_LINKER_BOILERPLATE
+rdos*)
+  dynamic_linker=no
+  ;;
 
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
 
-# _LT_AC_SYS_LIBPATH_AIX
-# ----------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-])# _LT_AC_SYS_LIBPATH_AIX
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
 
+sysv4 | sysv4.3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      export_dynamic_flag_spec='${wl}-Blargedynsym'
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
 
-# _LT_AC_SHELL_INIT(ARG)
-# ----------------------
-AC_DEFUN([_LT_AC_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
-	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-	 [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_AC_SHELL_INIT
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
 
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+    shlibpath_overrides_runpath=no
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    shlibpath_overrides_runpath=yes
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
 
-# _LT_AC_PROG_ECHO_BACKSLASH
-# --------------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
-[_LT_AC_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
 
-case X$ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+*)
+  dynamic_linker=no
   ;;
 esac
+AC_MSG_RESULT([$dynamic_linker])
+test "$dynamic_linker" = no && can_build_shared=no
 
-echo=${ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X[$]1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
+])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
 
-if test "X[$]1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-[$]*
-EOF
-  exit 0
-fi
 
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# _LT_AC_TAGCONFIG
+# ----------------
+AC_DEFUN([_LT_AC_TAGCONFIG],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_ARG_WITH([tags],
+    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+        [include additional configurations @<:@automatic@:>@])],
+    [tagnames="$withval"])
 
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
-  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-       echo_test_string=`eval $cmd` &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-    then
-      break
+if test -f "$ltmain" && test -n "$tagnames"; then
+  if test ! -f "${ofile}"; then
+    AC_MSG_WARN([output file `$ofile' does not exist])
+  fi
+
+  if test -z "$LTCC"; then
+    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
+    if test -z "$LTCC"; then
+      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
+    else
+      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
     fi
-  done
-fi
+  fi
+  if test -z "$LTCFLAGS"; then
+    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
+  fi
 
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-   test "X$echo_testing_string" = "X$echo_test_string"; then
-  :
-else
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
+  # Extract list of available tagged configurations in $ofile.
+  # Note that this assumes the entire list is on one line.
+  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
 
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for dir in $PATH /usr/ucb; do
+  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+  for tagname in $tagnames; do
     IFS="$lt_save_ifs"
-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      echo="$dir/echo"
-      break
+    # Check whether tagname contains only valid characters
+    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
+    "") ;;
+    *)  AC_MSG_ERROR([invalid tag name: $tagname])
+	;;
+    esac
+
+    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
+    then
+      AC_MSG_ERROR([tag name \"$tagname\" already exists])
     fi
-  done
-  IFS="$lt_save_ifs"
 
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running configure again with it.
-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-    else
-      # Try using printf.
-      echo='printf %s\n'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-	 test "X$echo_testing_string" = "X$echo_test_string"; then
-	# Cool, printf works
-	:
-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	export CONFIG_SHELL
-	SHELL="$CONFIG_SHELL"
-	export SHELL
-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-      else
-	# maybe with a smaller string...
-	prev=:
+    # Update the list of available tags.
+    if test -n "$tagname"; then
+      echo appending configuration tag \"$tagname\" to $ofile
 
-	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-	  then
-	    break
-	  fi
-	  prev="$cmd"
-	done
+      case $tagname in
+      CXX)
+	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+	    (test "X$CXX" != "Xg++"))) ; then
+	  AC_LIBTOOL_LANG_CXX_CONFIG
+	else
+	  tagname=""
+	fi
+	;;
 
-	if test "$prev" != 'sed 50q "[$]0"'; then
-	  echo_test_string=`eval $prev`
-	  export echo_test_string
-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+      F77)
+	if test -n "$F77" && test "X$F77" != "Xno"; then
+	  AC_LIBTOOL_LANG_F77_CONFIG
 	else
-	  # Oops.  We lost completely, so just stick with echo.
-	  echo=echo
+	  tagname=""
 	fi
-      fi
+	;;
+
+      GCJ)
+	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+	  AC_LIBTOOL_LANG_GCJ_CONFIG
+	else
+	  tagname=""
+	fi
+	;;
+
+      RC)
+	AC_LIBTOOL_LANG_RC_CONFIG
+	;;
+
+      *)
+	AC_MSG_ERROR([Unsupported tag name: $tagname])
+	;;
+      esac
+
+      # Append the new tag name to the list of available tags.
+      if test -n "$tagname" ; then
+      available_tags="$available_tags $tagname"
     fi
+    fi
+  done
+  IFS="$lt_save_ifs"
+
+  # Now substitute the updated list of available tags.
+  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
+    mv "${ofile}T" "$ofile"
+    chmod +x "$ofile"
+  else
+    rm -f "${ofile}T"
+    AC_MSG_ERROR([unable to update list of available tagged configurations.])
   fi
 fi
-fi
+])# _LT_AC_TAGCONFIG
 
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
 
-AC_SUBST(ECHO)
-])])# _LT_AC_PROG_ECHO_BACKSLASH
+# AC_LIBTOOL_DLOPEN
+# -----------------
+# enable checks for dlopen support
+AC_DEFUN([AC_LIBTOOL_DLOPEN],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
+])# AC_LIBTOOL_DLOPEN
 
 
-# _LT_AC_LOCK
-# -----------
-AC_DEFUN([_LT_AC_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
-    [AC_HELP_STRING([--disable-libtool-lock],
-	[avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+# AC_LIBTOOL_WIN32_DLL
+# --------------------
+# declare package support for building win32 DLLs
+AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+])# AC_LIBTOOL_WIN32_DLL
 
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-   if test "$lt_cv_prog_gnu_ld" = yes; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -melf32bsmip"
-      ;;
-    *N32*)
-      LD="${LD-ld} -melf32bmipn32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -melf64bmip"
-      ;;
-    esac
-   else
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
+
+# AC_ENABLE_SHARED([DEFAULT])
+# ---------------------------
+# implement the --enable-shared flag
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+AC_DEFUN([AC_ENABLE_SHARED],
+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE([shared],
+    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
       ;;
-    esac
-   fi
-  fi
-  rm -rf conftest*
-  ;;
+    esac],
+    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
+])# AC_ENABLE_SHARED
 
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *32-bit*)
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_i386"
-          ;;
-        ppc64-*linux*|powerpc64-*linux*)
-          LD="${LD-ld} -m elf32ppclinux"
-          ;;
-        s390x-*linux*)
-          LD="${LD-ld} -m elf_s390"
-          ;;
-        sparc64-*linux*)
-          LD="${LD-ld} -m elf32_sparc"
-          ;;
-      esac
-      ;;
-    *64-bit*)
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        ppc*-*linux*|powerpc*-*linux*)
-          LD="${LD-ld} -m elf64ppc"
-          ;;
-        s390*-*linux*)
-          LD="${LD-ld} -m elf64_s390"
-          ;;
-        sparc*-*linux*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_PUSH(C)
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_POP])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-sparc*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)    LD="${LD-ld} -64" ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
 
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-  ])
-esac
+# AC_DISABLE_SHARED
+# -----------------
+# set the default shared flag to --disable-shared
+AC_DEFUN([AC_DISABLE_SHARED],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_SHARED(no)
+])# AC_DISABLE_SHARED
 
-need_locks="$enable_libtool_lock"
 
-])# _LT_AC_LOCK
+# AC_ENABLE_STATIC([DEFAULT])
+# ---------------------------
+# implement the --enable-static flag
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+AC_DEFUN([AC_ENABLE_STATIC],
+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE([static],
+    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
+])# AC_ENABLE_STATIC
 
 
-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
-[AC_REQUIRE([LT_AC_PROG_SED])
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       $2=yes
-     fi
-   fi
-   $rm conftest*
-])
+# AC_DISABLE_STATIC
+# -----------------
+# set the default static flag to --disable-static
+AC_DEFUN([AC_DISABLE_STATIC],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_STATIC(no)
+])# AC_DISABLE_STATIC
 
-if test x"[$]$2" = xyes; then
-    ifelse([$5], , :, [$5])
-else
-    ifelse([$6], , :, [$6])
-fi
-])# AC_LIBTOOL_COMPILER_OPTION
 
+# AC_ENABLE_FAST_INSTALL([DEFAULT])
+# ---------------------------------
+# implement the --enable-fast-install flag
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+AC_DEFUN([AC_ENABLE_FAST_INSTALL],
+[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE([fast-install],
+    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
+])# AC_ENABLE_FAST_INSTALL
 
-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                          [ACTION-SUCCESS], [ACTION-FAILURE])
-# ------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-[AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $3"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
-     else
-       $2=yes
-     fi
-   fi
-   $rm conftest*
-   LDFLAGS="$save_LDFLAGS"
-])
 
-if test x"[$]$2" = xyes; then
-    ifelse([$4], , :, [$4])
-else
-    ifelse([$5], , :, [$5])
-fi
-])# AC_LIBTOOL_LINKER_OPTION
+# AC_DISABLE_FAST_INSTALL
+# -----------------------
+# set the default to --disable-fast-install
+AC_DEFUN([AC_DISABLE_FAST_INSTALL],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_FAST_INSTALL(no)
+])# AC_DISABLE_FAST_INSTALL
 
 
-# AC_LIBTOOL_SYS_MAX_CMD_LEN
+# AC_LIBTOOL_PICMODE([MODE])
 # --------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
-[# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-  i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
+# implement the --with-pic flag
+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+AC_DEFUN([AC_LIBTOOL_PICMODE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+pic_mode=ifelse($#,1,$1,default)
+])# AC_LIBTOOL_PICMODE
 
-  cygwin* | mingw*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
 
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
+# AC_PROG_EGREP
+# -------------
+# This is predefined starting with Autoconf 2.54, so this conditional
+# definition can be removed once we require Autoconf 2.54 or later.
+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
+[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
+   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+    then ac_cv_prog_egrep='grep -E'
+    else ac_cv_prog_egrep='egrep'
+    fi])
+ EGREP=$ac_cv_prog_egrep
+ AC_SUBST([EGREP])
+])])
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
 
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
+# AC_PATH_TOOL_PREFIX
+# -------------------
+# find a file program which can recognize shared library
+AC_DEFUN([AC_PATH_TOOL_PREFIX],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] |  ?:[\\/]*])
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="ifelse([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$1; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<EOF 1>&2
 
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+EOF
+	  fi ;;
+	esac
+      fi
+      break
     fi
-    ;;
-  *)
-    # If test is not a shell built-in, we'll probably end up computing a
-    # maximum length that is only half of the actual maximum length, but
-    # we can't tell.
-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
-	       = "XX$teststring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      teststring=$teststring$teststring
-    done
-    teststring=
-    # Add a significant safety factor because C++ compilers can tack on massive
-    # amounts of additional arguments before passing them to the linker.
-    # It appears as though 1/2 is a usable value.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    ;;
-  esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac])
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
 else
-  AC_MSG_RESULT(none)
+  AC_MSG_RESULT(no)
 fi
-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
+])# AC_PATH_TOOL_PREFIX
 
 
-# _LT_AC_CHECK_DLFCN
-# ------------------
-AC_DEFUN([_LT_AC_CHECK_DLFCN],
-[AC_CHECK_HEADERS(dlfcn.h)dnl
-])# _LT_AC_CHECK_DLFCN
+# AC_PATH_MAGIC
+# -------------
+# find a file program which can recognize a shared library
+AC_DEFUN([AC_PATH_MAGIC],
+[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+  else
+    MAGIC_CMD=:
+  fi
+fi
+])# AC_PATH_MAGIC
 
 
-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ---------------------------------------------------------------------
-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
-  [$4]
+# AC_PROG_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([AC_PROG_LD],
+[AC_ARG_WITH([gnu-ld],
+    [AC_HELP_STRING([--with-gnu-ld],
+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])
+AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by $CC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
 else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-[#line __oline__ "configure"
-#include "confdefs.h"
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+AC_PROG_LD_GNU
+])# AC_PROG_LD
 
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
 
-#include <stdio.h>
+# AC_PROG_LD_GNU
+# --------------
+AC_DEFUN([AC_PROG_LD_GNU],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# AC_PROG_LD_GNU
 
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
 
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
+# AC_PROG_LD_RELOAD_FLAG
+# ----------------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+])# AC_PROG_LD_RELOAD_FLAG
 
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
 
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
+# AC_DEPLIBS_CHECK_METHOD
+# -----------------------
+# how to check for library dependencies
+#  -- PORTME fill in with the dynamic library characteristics
+AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+[AC_CACHE_CHECK([how to recognize dependent libraries],
+lt_cv_deplibs_check_method,
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
 
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
+case $host_os in
+aix4* | aix5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
-    exit (status);
-}]
-EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) $1 ;;
-      x$lt_dlneed_uscore) $2 ;;
-      x$lt_dlunknown|x*) $3 ;;
-    esac
-  else :
-    # compilation failed
-    $3
-  fi
-fi
-rm -fr conftest*
-])# _LT_AC_TRY_DLOPEN_SELF
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
+bsdi[[45]]*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
 
-# AC_LIBTOOL_DLOPEN_SELF
-# ----------------------
-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
 
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
 
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
 
-  darwin*)
-  # if libdl is installed we need to link against it
-    AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ])
-   ;;
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
   *)
-    AC_CHECK_FUNC([shl_load],
-	  [lt_cv_dlopen="shl_load"],
-      [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
-	[AC_CHECK_FUNC([dlopen],
-	      [lt_cv_dlopen="dlopen"],
-	  [AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-	    [AC_CHECK_LIB([svld], [dlopen],
-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
-	      ])
-	    ])
-	  ])
-	])
-      ])
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
     ;;
   esac
+  ;;
 
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
+interix[[3-9]]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd* | netbsdelf*-gnu)
+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   else
-    enable_dlopen=no
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
   fi
+  ;;
 
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
 
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+nto-qnx*)
+  lt_cv_deplibs_check_method=unknown
+  ;;
 
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    AC_CACHE_CHECK([whether a program can dlopen itself],
-	  lt_cv_dlopen_self, [dnl
-	  _LT_AC_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-    ])
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  fi
+  ;;
 
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-    	  lt_cv_dlopen_self_static, [dnl
-	  _LT_AC_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-      ])
-    fi
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
   esac
-fi
-])# AC_LIBTOOL_DLOPEN_SELF
-
-
-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
-# ---------------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler
-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+  ;;
 
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-     fi
-   fi
-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
 ])
-])# AC_LIBTOOL_PROG_CC_C_O
-
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+])# AC_DEPLIBS_CHECK_METHOD
 
-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
-# -----------------------------------------
-# Check to see if we can do hard links to lock some files if needed
-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
-[AC_REQUIRE([_LT_AC_LOCK])dnl
 
-hard_links="nottested"
-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  AC_MSG_CHECKING([if we can lock with hard links])
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  AC_MSG_RESULT([$hard_links])
-  if test "$hard_links" = no; then
-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-    need_locks=warn
-  fi
+# AC_PROG_NM
+# ----------
+# find the pathname to a BSD-compatible name lister
+AC_DEFUN([AC_PROG_NM],
+[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
 else
-  need_locks=no
-fi
-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
-
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+fi])
+NM="$lt_cv_path_NM"
+])# AC_PROG_NM
 
-# AC_LIBTOOL_OBJDIR
-# -----------------
-AC_DEFUN([AC_LIBTOOL_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-])# AC_LIBTOOL_OBJDIR
 
+# AC_CHECK_LIBM
+# -------------
+# check for math library
+AC_DEFUN([AC_CHECK_LIBM],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, cos, LIBM="-lm")
+  ;;
+esac
+])# AC_CHECK_LIBM
 
-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
-# ----------------------------------------------
-# Check hardcoding attributes.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_AC_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
-   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
 
-  # We can hardcode non-existant directories.
-  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
-    # Linking always hardcodes the temporary library directory.
-    _LT_AC_TAGVAR(hardcode_action, $1)=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
-
-
-# AC_LIBTOOL_SYS_LIB_STRIP
-# ------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
-[striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         AC_MSG_RESULT([yes])
-       else
-  AC_MSG_RESULT([no])
-fi
-       ;;
-   *)
-  AC_MSG_RESULT([no])
-    ;;
+# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
+# -----------------------------------
+# sets LIBLTDL to the link flags for the libltdl convenience library and
+# LTDLINCL to the include flags for the libltdl header and adds
+# --enable-ltdl-convenience to the configure arguments.  Note that
+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
+# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
+# (note the single quotes!).  If your package is not flat and you're not
+# using automake, define top_builddir and top_srcdir appropriately in
+# the Makefiles.
+AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  case $enable_ltdl_convenience in
+  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+  "") enable_ltdl_convenience=yes
+      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
   esac
-fi
-])# AC_LIBTOOL_SYS_LIB_STRIP
+  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
+  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+  # For backwards non-gettext consistent compatibility...
+  INCLTDL="$LTDLINCL"
+])# AC_LIBLTDL_CONVENIENCE
 
 
-# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-[AC_MSG_CHECKING([dynamic linker characteristics])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
+# -----------------------------------
+# sets LIBLTDL to the link flags for the libltdl installable library and
+# LTDLINCL to the include flags for the libltdl header and adds
+# --enable-ltdl-install to the configure arguments.  Note that
+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
+# and an installed libltdl is not found, it is assumed to be `libltdl'.
+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
+# '${top_srcdir}/' (note the single quotes!).  If your package is not
+# flat and you're not using automake, define top_builddir and top_srcdir
+# appropriately in the Makefiles.
+# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  AC_CHECK_LIB(ltdl, lt_dlinit,
+  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+  [if test x"$enable_ltdl_install" = xno; then
+     AC_MSG_WARN([libltdl not installed, but installation disabled])
+   else
+     enable_ltdl_install=yes
+   fi
+  ])
+  if test x"$enable_ltdl_install" = x"yes"; then
+    ac_configure_args="$ac_configure_args --enable-ltdl-install"
+    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
   else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+    LIBLTDL="-lltdl"
+    LTDLINCL=
   fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
+  # For backwards non-gettext consistent compatibility...
+  INCLTDL="$LTDLINCL"
+])# AC_LIBLTDL_INSTALLABLE
 
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
 
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
+# AC_LIBTOOL_CXX
+# --------------
+# enable support for C++ libraries
+AC_DEFUN([AC_LIBTOOL_CXX],
+[AC_REQUIRE([_LT_AC_LANG_CXX])
+])# AC_LIBTOOL_CXX
 
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
 
-aix4* | aix5*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[[01]] | aix4.[[01]].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
+# _LT_AC_LANG_CXX
+# ---------------
+AC_DEFUN([_LT_AC_LANG_CXX],
+[AC_REQUIRE([AC_PROG_CXX])
+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+])# _LT_AC_LANG_CXX
 
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
+# _LT_AC_PROG_CXXCPP
+# ------------------
+AC_DEFUN([_LT_AC_PROG_CXXCPP],
+[
+AC_REQUIRE([AC_PROG_CXX])
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  AC_PROG_CXXCPP
+fi
+])# _LT_AC_PROG_CXXCPP
 
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
+# AC_LIBTOOL_F77
+# --------------
+# enable support for Fortran 77 libraries
+AC_DEFUN([AC_LIBTOOL_F77],
+[AC_REQUIRE([_LT_AC_LANG_F77])
+])# AC_LIBTOOL_F77
 
-bsdi[[45]]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
 
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
+# _LT_AC_LANG_F77
+# ---------------
+AC_DEFUN([_LT_AC_LANG_F77],
+[AC_REQUIRE([AC_PROG_F77])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
+])# _LT_AC_LANG_F77
 
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
 
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
+# AC_LIBTOOL_GCJ
+# --------------
+# enable support for GCJ libraries
+AC_DEFUN([AC_LIBTOOL_GCJ],
+[AC_REQUIRE([_LT_AC_LANG_GCJ])
+])# AC_LIBTOOL_GCJ
 
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
 
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
+# _LT_AC_LANG_GCJ
+# ---------------
+AC_DEFUN([_LT_AC_LANG_GCJ],
+[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
+    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
+      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
+	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
+	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
+])# _LT_AC_LANG_GCJ
 
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
+# AC_LIBTOOL_RC
+# -------------
+# enable support for Windows resource files
+AC_DEFUN([AC_LIBTOOL_RC],
+[AC_REQUIRE([LT_AC_PROG_RC])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
+])# AC_LIBTOOL_RC
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
+
+# AC_LIBTOOL_LANG_C_CONFIG
+# ------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
+AC_DEFUN([_LT_AC_LANG_C_CONFIG],
+[lt_save_CC="$CC"
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_AC_SYS_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+AC_LIBTOOL_SYS_LIB_STRIP
+AC_LIBTOOL_DLOPEN_SELF
+
+# Report which library types will actually be built
+AC_MSG_CHECKING([if libtool supports shared libraries])
+AC_MSG_RESULT([$can_build_shared])
+
+AC_MSG_CHECKING([whether to build shared libraries])
+test "$can_build_shared" = "no" && enable_shared=no
+
+# On AIX, shared libraries and static libraries use the same namespace, and
+# are all built from PIC.
+case $host_os in
+aix3*)
+  test "$enable_shared" = yes && enable_static=no
+  if test -n "$RANLIB"; then
+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+    postinstall_cmds='$RANLIB $lib'
+  fi
   ;;
 
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
+aix4* | aix5*)
+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+    test "$enable_shared" = yes && enable_static=no
   fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
-  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  freebsd*) # from 4.6 on
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
     ;;
-  esac
-  ;;
+esac
+AC_MSG_RESULT([$enable_shared])
 
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
+AC_MSG_CHECKING([whether to build static libraries])
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+AC_MSG_RESULT([$enable_static])
 
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
+AC_LIBTOOL_CONFIG($1)
 
-interix3*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
+AC_LANG_POP
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_C_CONFIG
 
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
 
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
+# AC_LIBTOOL_LANG_CXX_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
+AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+[AC_LANG_PUSH(C++)
+AC_REQUIRE([AC_PROG_CXX])
+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
 
-# This must be Linux ELF.
-linux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+_LT_AC_TAGVAR(always_export_symbols, $1)=no
+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_direct, $1)=no
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+_LT_AC_TAGVAR(module_cmds, $1)=
+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_AC_TAGVAR(no_undefined_flag, $1)=
+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
 
-  # find out which ABI we are using
-  libsuff=
-  case "$host_cpu" in
-  x86_64*|s390x*|powerpc64*)
-    echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-    if AC_TRY_EVAL(ac_compile); then
-      case `/usr/bin/file conftest.$ac_objext` in
-      *64-bit*)
-        libsuff=64
-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-        ;;
-      esac
-    fi
-    rm -rf conftest*
-    ;;
-  esac
+# Dependencies to place before and after the object being linked:
+_LT_AC_TAGVAR(predep_objects, $1)=
+_LT_AC_TAGVAR(postdep_objects, $1)=
+_LT_AC_TAGVAR(predeps, $1)=
+_LT_AC_TAGVAR(postdeps, $1)=
+_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
 
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^[	 ]*//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
-  fi
+# Source file extension for C++ test sources.
+ac_ext=cpp
 
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
 
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
 
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
 
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
 
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[[89]] | openbsd2.[[89]].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_LD=$LD
+lt_save_GCC=$GCC
+GCC=$GXX
+lt_save_with_gnu_ld=$with_gnu_ld
+lt_save_path_LD=$lt_cv_path_LD
+if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+else
+  $as_unset lt_cv_prog_gnu_ld
+fi
+if test -n "${lt_cv_path_LDCXX+set}"; then
+  lt_cv_path_LD=$lt_cv_path_LDCXX
+else
+  $as_unset lt_cv_path_LD
+fi
+test -z "${LDCXX+set}" || LD=$LDCXX
+CC=${CXX-"c++"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
 
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
+# We don't want -fno-exception wen compiling C++ code, so set the
+# no_builtin_flag separately
+if test "$GXX" = yes; then
+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+else
+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+fi
 
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
+if test "$GXX" = yes; then
+  # Set up default GNU C++ configuration
 
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
+  AC_PROG_LD
 
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
+  # Check if GNU C++ uses GNU ld as the underlying linker, since the
+  # archiving commands below assume that GNU ld is being used.
   if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 
-sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
 
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+    #     investigate it a little bit more. (MM)
+    wlarc='${wl}'
 
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-    shlibpath_overrides_runpath=no
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
+	grep 'no-whole-archive' > /dev/null; then
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
   else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    shlibpath_overrides_runpath=yes
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
+    with_gnu_ld=no
+    wlarc=
 
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
+    # A generic and very simple default shared library creation
+    # command for GNU C++ for the case where it uses the native
+    # linker, instead of GNU ld.  If possible, this setting should
+    # overridden to take advantage of the native linker features on
+    # the platform it is being used on.
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+  fi
 
-*)
-  dynamic_linker=no
-  ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
+  # Commands to make compiler produce verbose output that lists
+  # what "hidden" libraries, object files and flags are used when
+  # linking a shared library.
+  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
 
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+else
+  GXX=no
+  with_gnu_ld=no
+  wlarc=
 fi
-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-
-
-# _LT_AC_TAGCONFIG
-# ----------------
-AC_DEFUN([_LT_AC_TAGCONFIG],
-[AC_ARG_WITH([tags],
-    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
-        [include additional configurations @<:@automatic@:>@])],
-    [tagnames="$withval"])
-
-if test -f "$ltmain" && test -n "$tagnames"; then
-  if test ! -f "${ofile}"; then
-    AC_MSG_WARN([output file `$ofile' does not exist])
-  fi
 
-  if test -z "$LTCC"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-    if test -z "$LTCC"; then
-      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
+# PORTME: fill in a description of your system's C++ link characteristics
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+case $host_os in
+  aix3*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  aix4* | aix5*)
+    if test "$host_cpu" = ia64; then
+      # On IA64, the linker does run time linking by default, so we don't
+      # have to do anything special.
+      aix_use_runtimelinking=no
+      exp_sym_flag='-Bexport'
+      no_entry_flag=""
     else
-      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
-    fi
-  fi
-  if test -z "$LTCFLAGS"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
-  fi
-
-  # Extract list of available tagged configurations in $ofile.
-  # Note that this assumes the entire list is on one line.
-  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
+      aix_use_runtimelinking=no
 
-  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-  for tagname in $tagnames; do
-    IFS="$lt_save_ifs"
-    # Check whether tagname contains only valid characters
-    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
-    "") ;;
-    *)  AC_MSG_ERROR([invalid tag name: $tagname])
+      # Test if we are trying to use run time linking or normal
+      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+      # need to do runtime linking.
+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+	for ld_flag in $LDFLAGS; do
+	  case $ld_flag in
+	  *-brtl*)
+	    aix_use_runtimelinking=yes
+	    break
+	    ;;
+	  esac
+	done
 	;;
-    esac
+      esac
 
-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-    then
-      AC_MSG_ERROR([tag name \"$tagname\" already exists])
+      exp_sym_flag='-bexport'
+      no_entry_flag='-bnoentry'
     fi
 
-    # Update the list of available tags.
-    if test -n "$tagname"; then
-      echo appending configuration tag \"$tagname\" to $ofile
+    # When large executables or shared objects are built, AIX ld can
+    # have problems creating the table of contents.  If linking a library
+    # or program results in "error TOC overflow" add -mminimal-toc to
+    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
 
-      case $tagname in
-      CXX)
-	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-	    (test "X$CXX" != "Xg++"))) ; then
-	  AC_LIBTOOL_LANG_CXX_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
+    _LT_AC_TAGVAR(archive_cmds, $1)=''
+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 
-      F77)
-	if test -n "$F77" && test "X$F77" != "Xno"; then
-	  AC_LIBTOOL_LANG_F77_CONFIG
+    if test "$GXX" = yes; then
+      case $host_os in aix4.[[012]]|aix4.[[012]].*)
+      # We only want to do this on AIX 4.2 and lower, the check
+      # below for broken collect2 doesn't work under 4.3+
+	collect2name=`${CC} -print-prog-name=collect2`
+	if test -f "$collect2name" && \
+	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	then
+	  # We have reworked collect2
+	  :
 	else
-	  tagname=""
+	  # We have old collect2
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
 	fi
 	;;
-
-      GCJ)
-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-	  AC_LIBTOOL_LANG_GCJ_CONFIG
+      esac
+      shared_flag='-shared'
+      if test "$aix_use_runtimelinking" = yes; then
+	shared_flag="$shared_flag "'${wl}-G'
+      fi
+    else
+      # not using gcc
+      if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	shared_flag='-G'
+      else
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag='${wl}-G'
 	else
-	  tagname=""
+	  shared_flag='${wl}-bM:SRE'
 	fi
-	;;
-
-      RC)
-	AC_LIBTOOL_LANG_RC_CONFIG
-	;;
-
-      *)
-	AC_MSG_ERROR([Unsupported tag name: $tagname])
-	;;
-      esac
+      fi
+    fi
 
-      # Append the new tag name to the list of available tags.
-      if test -n "$tagname" ; then
-      available_tags="$available_tags $tagname"
-    fi
+    # It seems that -bexpall does not export symbols beginning with
+    # underscore (_), so it is better to generate a list of symbols to export.
+    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+    if test "$aix_use_runtimelinking" = yes; then
+      # Warning - without using the other runtime loading flags (-brtl),
+      # -berok will link without error, but may produce a broken library.
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+      # Determine the default libpath from the value encoded in an empty executable.
+      _LT_AC_SYS_LIBPATH_AIX
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+     else
+      if test "$host_cpu" = ia64; then
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+      else
+	# Determine the default libpath from the value encoded in an empty executable.
+	_LT_AC_SYS_LIBPATH_AIX
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	# Warning - without using the other run time loading flags,
+	# -berok will link without error, but may produce a broken library.
+	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	# Exported symbols can be pulled into shared objects from archives
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+	# This is similar to how AIX traditionally builds its shared libraries.
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+      fi
     fi
-  done
-  IFS="$lt_save_ifs"
+    ;;
 
-  # Now substitute the updated list of available tags.
-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-    mv "${ofile}T" "$ofile"
-    chmod +x "$ofile"
-  else
-    rm -f "${ofile}T"
-    AC_MSG_ERROR([unable to update list of available tagged configurations.])
-  fi
-fi
-])# _LT_AC_TAGCONFIG
+  beos*)
+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+      # support --undefined.  This deserves some investigation.  FIXME
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    fi
+    ;;
 
+  chorus*)
+    case $cc_basename in
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
 
-# AC_LIBTOOL_DLOPEN
-# -----------------
-# enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_DLOPEN
+  cygwin* | mingw* | pw32*)
+    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+    # as there is no search path for DLLs.
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+    _LT_AC_TAGVAR(always_export_symbols, $1)=no
+    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 
+    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      # If the export-symbols file already is a .def file (1st line
+      # is EXPORTS), use it as is; otherwise, prepend...
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	cp $export_symbols $output_objdir/$soname.def;
+      else
+	echo EXPORTS > $output_objdir/$soname.def;
+	cat $export_symbols >> $output_objdir/$soname.def;
+      fi~
+      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    fi
+  ;;
+      darwin* | rhapsody*)
+        case $host_os in
+        rhapsody* | darwin1.[[012]])
+         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[[012]])
+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
+        esac
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 
-# AC_LIBTOOL_WIN32_DLL
-# --------------------
-# declare package support for building win32 DLLs
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_WIN32_DLL
+    if test "$GXX" = yes ; then
+      lt_int_apple_cc_single_mod=no
+      output_verbose_link_cmd='echo'
+      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+       lt_int_apple_cc_single_mod=yes
+      fi
+      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      else
+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+        fi
+        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          else
+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          fi
+            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      else
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+          ;;
+      esac
+      fi
+        ;;
 
+  dgux*)
+    case $cc_basename in
+      ec++*)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      ghcx*)
+	# Green Hills C++ Compiler
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+  freebsd[[12]]*)
+    # C++ shared libraries reported to be fairly broken before switch to ELF
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  freebsd-elf*)
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    ;;
+  freebsd* | dragonfly*)
+    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+    # conventions
+    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+    ;;
+  gnu*)
+    ;;
+  hpux9*)
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				# but as the default
+				# location of the library.
 
-# AC_ENABLE_SHARED([DEFAULT])
-# ---------------------------
-# implement the --enable-shared flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([shared],
-    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
+    case $cc_basename in
+    CC*)
+      # FIXME: insert proper C++ library support
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    aCC*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      #
+      # There doesn't appear to be a way to prevent this compiler from
+      # explicitly linking system object files so we need to strip them
+      # from the output so that they don't get included in the library
+      # dependencies.
+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+      ;;
     *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
+      if test "$GXX" = yes; then
+        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+        # FIXME: insert proper C++ library support
+        _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
       ;;
-    esac],
-    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
-])# AC_ENABLE_SHARED
-
+    esac
+    ;;
+  hpux10*|hpux11*)
+    if test $with_gnu_ld = no; then
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 
-# AC_DISABLE_SHARED
-# -----------------
-# set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_SHARED(no)
-])# AC_DISABLE_SHARED
-
-
-# AC_ENABLE_STATIC([DEFAULT])
-# ---------------------------
-# implement the --enable-static flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([static],
-    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
+      case $host_cpu in
+      hppa*64*|ia64*) ;;
+      *)
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        ;;
+      esac
+    fi
+    case $host_cpu in
+    hppa*64*|ia64*)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
     *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					      # but as the default
+					      # location of the library.
       ;;
-    esac],
-    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
-])# AC_ENABLE_STATIC
-
-
-# AC_DISABLE_STATIC
-# -----------------
-# set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_STATIC(no)
-])# AC_DISABLE_STATIC
+    esac
 
+    case $cc_basename in
+      CC*)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      aCC*)
+	case $host_cpu in
+	hppa*64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  ;;
+	esac
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	if test "$GXX" = yes; then
+	  if test $with_gnu_ld = no; then
+	    case $host_cpu in
+	    hppa*64*)
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      ;;
+	    ia64*)
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      ;;
+	    *)
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      ;;
+	    esac
+	  fi
+	else
+	  # FIXME: insert proper C++ library support
+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+    esac
+    ;;
+  interix[[3-9]]*)
+    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+    # Instead, shared libraries are loaded at an image base (0x10000000 by
+    # default) and relocated if they conflict, which is a slow very memory
+    # consuming and fragmenting process.  To avoid this, we pick a random,
+    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+    ;;
+  irix5* | irix6*)
+    case $cc_basename in
+      CC*)
+	# SGI C++
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 
-# AC_ENABLE_FAST_INSTALL([DEFAULT])
-# ---------------------------------
-# implement the --enable-fast-install flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([fast-install],
-    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
+	# Archives containing C++ object files must be created using
+	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	# necessary to make sure instantiated templates are included
+	# in the archive.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	;;
+      *)
+	if test "$GXX" = yes; then
+	  if test "$with_gnu_ld" = no; then
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	  else
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+	  fi
 	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
-])# AC_ENABLE_FAST_INSTALL
+	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+	;;
+    esac
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+    ;;
+  linux* | k*bsd*-gnu)
+    case $cc_basename in
+      KCC*)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
 
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 
-# AC_DISABLE_FAST_INSTALL
-# -----------------------
-# set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_FAST_INSTALL(no)
-])# AC_DISABLE_FAST_INSTALL
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
 
+	# Archives containing C++ object files must be created using
+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	;;
+      icpc*)
+	# Intel C++
+	with_gnu_ld=yes
+	# version 8.0 and above of icpc choke on multiply defined symbols
+	# if we add $predep_objects and $postdep_objects, however 7.1 and
+	# earlier do not add the objects themselves.
+	case `$CC -V 2>&1` in
+	*"Version 7."*)
+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  ;;
+	*)  # Version 8.0 or newer
+	  tmp_idyn=
+	  case $host_cpu in
+	    ia64*) tmp_idyn=' -i_dynamic';;
+	  esac
+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  ;;
+	esac
+	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	;;
+      pgCC*)
+        # Portland Group C++ compiler
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
 
-# AC_LIBTOOL_PICMODE([MODE])
-# --------------------------
-# implement the --with-pic flag
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)
-])# AC_LIBTOOL_PICMODE
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+        ;;
+      cxx*)
+	# Compaq C++
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
 
+	runpath_var=LD_RUN_PATH
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 
-# AC_PROG_EGREP
-# -------------
-# This is predefined starting with Autoconf 2.54, so this conditional
-# definition can be removed once we require Autoconf 2.54 or later.
-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
-   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
-    fi])
- EGREP=$ac_cv_prog_egrep
- AC_SUBST([EGREP])
-])])
-
-
-# AC_PATH_TOOL_PREFIX
-# -------------------
-# find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] |  ?:[\\/]*])
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C++ 5.9
+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+
+	  # Not sure whether something based on
+	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	  # would be better.
+	  output_verbose_link_cmd='echo'
+
+	  # Archives containing C++ object files must be created using
+	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	  # necessary to make sure instantiated templates are included
+	  # in the archive.
+	  _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	  ;;
 	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-])# AC_PATH_TOOL_PREFIX
-
-
-# AC_PATH_MAGIC
-# -------------
-# find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])# AC_PATH_MAGIC
-
-
-# AC_PROG_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH([gnu-ld],
-    [AC_HELP_STRING([--with-gnu-ld],
-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])
-AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
+	;;
+    esac
     ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
+  lynxos*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
     ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
+  m88k*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  mvs*)
+    case $cc_basename in
+      cxx*)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
       *)
-	test "$with_gnu_ld" != yes && break
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
-      esac
+    esac
+    ;;
+  netbsd* | netbsdelf*-gnu)
+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+      wlarc=
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
     fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])# AC_PROG_LD
-
-
-# AC_PROG_LD_GNU
-# --------------
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# AC_PROG_LD_GNU
-
-
-# AC_PROG_LD_RELOAD_FLAG
-# ----------------------
-# find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files],
-  lt_cv_ld_reload_flag,
-  [lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    # Workaround some broken pre-1.5 toolchains
+    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+    ;;
+  openbsd2*)
+    # C++ shared libraries are fairly broken
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  openbsd*)
+    if test -f /usr/libexec/ld.so; then
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      fi
+      output_verbose_link_cmd='echo'
     else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
     fi
     ;;
-esac
-])# AC_PROG_LD_RELOAD_FLAG
-
+  osf3*)
+    case $cc_basename in
+      KCC*)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
 
-# AC_DEPLIBS_CHECK_METHOD
-# -----------------------
-# how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependent libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix4* | aix5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
 
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 
-bsdi[[45]]*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
+	# Archives containing C++ object files must be created using
+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
 
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
+	;;
+      RCC*)
+	# Rational C++ 2.4.1
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      cxx*)
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 
-freebsd* | kfreebsd*-gnu | dragonfly*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
+	  # Commands to make compiler produce verbose output that lists
+	  # what "hidden" libraries, object files and flags are used when
+	  # linking a shared library.
+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
 
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+	else
+	  # FIXME: insert proper C++ library support
+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+    esac
     ;;
-  esac
-  ;;
-
-interix3*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
+  osf4* | osf5*)
+    case $cc_basename in
+      KCC*)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
 
-# This must be Linux ELF.
-linux*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
 
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-  fi
-  ;;
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
+	# Archives containing C++ object files must be created using
+	# the KAI C++ compiler.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
+	;;
+      RCC*)
+	# Rational C++ 2.4.1
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      cxx*)
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	  echo "-hidden">> $lib.exp~
+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
+	  $rm $lib.exp'
 
-nto-qnx*)
-  lt_cv_deplibs_check_method=unknown
-  ;;
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  fi
-  ;;
+	# Commands to make compiler produce verbose output that lists
+	# what "hidden" libraries, object files and flags are used when
+	# linking a shared library.
+	#
+	# There doesn't appear to be a way to prevent this compiler from
+	# explicitly linking system object files so we need to strip them
+	# from the output so that they don't get included in the library
+	# dependencies.
+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+      *)
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
+	  # Commands to make compiler produce verbose output that lists
+	  # what "hidden" libraries, object files and flags are used when
+	  # linking a shared library.
+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
 
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+	else
+	  # FIXME: insert proper C++ library support
+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+    esac
     ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
+  psos*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
     ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+  sunos4*)
+    case $cc_basename in
+      CC*)
+	# Sun C++ 4.x
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      lcc*)
+	# Lucid
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
     ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
+  solaris*)
+    case $cc_basename in
+      CC*)
+	# Sun C++ 4.2, 5.x and Centerline C++
+        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
+	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
 
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-])# AC_DEPLIBS_CHECK_METHOD
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	case $host_os in
+	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	  *)
+	    # The compiler driver will combine and reorder linker options,
+	    # but understands `-z linker_flag'.
+	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	    ;;
+	esac
+	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 
+	output_verbose_link_cmd='echo'
 
-# AC_PROG_NM
-# ----------
-# find the pathname to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
+	# Archives containing C++ object files must be created using
+	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	# necessary to make sure instantiated templates are included
+	# in the archive.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	;;
+      gcx*)
+	# Green Hills C++ Compiler
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	# The C++ compiler must be used to create the archive.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	;;
+      *)
+	# GNU C++ compiler with Solaris linker
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+	  if $CC --version | grep -v '^2\.7' > /dev/null; then
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+	  else
+	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	    # platform.
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+	  fi
+
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	  case $host_os in
+	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
 	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
 	    ;;
 	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi])
-NM="$lt_cv_path_NM"
-])# AC_PROG_NM
+	fi
+	;;
+    esac
+    ;;
+  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    runpath_var='LD_RUN_PATH'
 
+    case $cc_basename in
+      CC*)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      *)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+    esac
+    ;;
+  sysv5* | sco3.2v5* | sco5v6*)
+    # Note: We can NOT use -z defs as we might desire, because we do not
+    # link with -lc, and that would cause any symbols used from libc to
+    # always be unresolved, which means just about no library would
+    # ever link correctly.  If we're not using GNU ld we use -z text
+    # though, which does catch some bad symbols but isn't as heavy-handed
+    # as -z defs.
+    # For security reasons, it is highly recommended that you always
+    # use absolute paths for naming shared libraries, and exclude the
+    # DT_RUNPATH tag from executables and libraries.  But doing so
+    # requires that you compile everything twice, which is a pain.
+    # So that behaviour is only enabled if SCOABSPATH is set to a
+    # non-empty value in the environment.  Most likely only useful for
+    # creating official distributions of packages.
+    # This is a hack until libtool officially supports absolute path
+    # names for shared libraries.
+    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+    runpath_var='LD_RUN_PATH'
 
-# AC_CHECK_LIBM
-# -------------
-# check for math library
-AC_DEFUN([AC_CHECK_LIBM],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
-  ;;
+    case $cc_basename in
+      CC*)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      *)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+    esac
+    ;;
+  tandem*)
+    case $cc_basename in
+      NCC*)
+	# NonStop-UX NCC 3.20
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+  vxworks*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  *)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
 esac
-])# AC_CHECK_LIBM
+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
 
+_LT_AC_TAGVAR(GCC, $1)="$GXX"
+_LT_AC_TAGVAR(LD, $1)="$LD"
 
-# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl convenience library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-convenience to the configure arguments.  Note that
-# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
-# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
-# (note the single quotes!).  If your package is not flat and you're not
-# using automake, define top_builddir and top_srcdir appropriately in
-# the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-  "") enable_ltdl_convenience=yes
-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-  esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_CONVENIENCE
+AC_LIBTOOL_POSTDEP_PREDEP($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
 
+AC_LIBTOOL_CONFIG($1)
 
-# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl installable library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-install to the configure arguments.  Note that
-# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-# and an installed libltdl is not found, it is assumed to be `libltdl'.
-# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and top_srcdir
-# appropriately in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  AC_CHECK_LIB(ltdl, lt_dlinit,
-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-  [if test x"$enable_ltdl_install" = xno; then
-     AC_MSG_WARN([libltdl not installed, but installation disabled])
-   else
-     enable_ltdl_install=yes
-   fi
-  ])
-  if test x"$enable_ltdl_install" = x"yes"; then
-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  else
-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-    LIBLTDL="-lltdl"
-    LTDLINCL=
-  fi
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_INSTALLABLE
-
+AC_LANG_POP
+CC=$lt_save_CC
+LDCXX=$LD
+LD=$lt_save_LD
+GCC=$lt_save_GCC
+with_gnu_ldcxx=$with_gnu_ld
+with_gnu_ld=$lt_save_with_gnu_ld
+lt_cv_path_LDCXX=$lt_cv_path_LD
+lt_cv_path_LD=$lt_save_path_LD
+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+])# AC_LIBTOOL_LANG_CXX_CONFIG
 
-# AC_LIBTOOL_CXX
-# --------------
-# enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX],
-[AC_REQUIRE([_LT_AC_LANG_CXX])
-])# AC_LIBTOOL_CXX
+# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
+# ------------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
+int a;
+void foo (void) { a = 0; }
+EOF
+],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+EOF
+],[$1],[F77],[cat > conftest.$ac_ext <<EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+EOF
+],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+EOF
+])
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
 
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
 
-# _LT_AC_LANG_CXX
-# ---------------
-AC_DEFUN([_LT_AC_LANG_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
-])# _LT_AC_LANG_CXX
+  # The `*' in the case matches for architectures that use `case' in
+  # $output_verbose_cmd can trigger glob expansion during the loop
+  # eval without this substitution.
+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
 
-# _LT_AC_PROG_CXXCPP
-# ------------------
-AC_DEFUN([_LT_AC_PROG_CXXCPP],
-[
-AC_REQUIRE([AC_PROG_CXX])
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-fi
-])# _LT_AC_PROG_CXXCPP
+  for p in `eval $output_verbose_link_cmd`; do
+    case $p in
 
-# AC_LIBTOOL_F77
-# --------------
-# enable support for Fortran 77 libraries
-AC_DEFUN([AC_LIBTOOL_F77],
-[AC_REQUIRE([_LT_AC_LANG_F77])
-])# AC_LIBTOOL_F77
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" \
+	  || test $p = "-R"; then
+	 prev=$p
+	 continue
+       else
+	 prev=
+       fi
 
+       if test "$pre_test_object_deps_done" = no; then
+	 case $p in
+	 -L* | -R*)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+	   else
+	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
+	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
+	 else
+	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
+	 fi
+       fi
+       ;;
 
-# _LT_AC_LANG_F77
-# ---------------
-AC_DEFUN([_LT_AC_LANG_F77],
-[AC_REQUIRE([AC_PROG_F77])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
-])# _LT_AC_LANG_F77
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
 
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
+	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
+	 else
+	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
+	 fi
+       else
+	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
+	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
+	 else
+	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
+	 fi
+       fi
+       ;;
 
-# AC_LIBTOOL_GCJ
-# --------------
-# enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],
-[AC_REQUIRE([_LT_AC_LANG_GCJ])
-])# AC_LIBTOOL_GCJ
+    *) ;; # Ignore the rest.
 
+    esac
+  done
 
-# _LT_AC_LANG_GCJ
-# ---------------
-AC_DEFUN([_LT_AC_LANG_GCJ],
-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
-])# _LT_AC_LANG_GCJ
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
 
+$rm -f confest.$objext
 
-# AC_LIBTOOL_RC
-# -------------
-# enable support for Windows resource files
-AC_DEFUN([AC_LIBTOOL_RC],
-[AC_REQUIRE([LT_AC_PROG_RC])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
-])# AC_LIBTOOL_RC
+# PORTME: override above test on systems where it is broken
+ifelse([$1],[CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_AC_TAGVAR(predep_objects,$1)=
+  _LT_AC_TAGVAR(postdep_objects,$1)=
+  _LT_AC_TAGVAR(postdeps,$1)=
+  ;;
 
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+    #
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
 
-# AC_LIBTOOL_LANG_C_CONFIG
-# ------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
-AC_DEFUN([_LT_AC_LANG_C_CONFIG],
-[lt_save_CC="$CC"
-AC_LANG_PUSH(C)
+solaris*)
+  case $cc_basename in
+  CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
 
-# Source file extension for C test sources.
-ac_ext=c
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+esac
+])
 
-# Object file extension for compiled C test sources.
+case " $_LT_AC_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+])# AC_LIBTOOL_POSTDEP_PREDEP
+
+# AC_LIBTOOL_LANG_F77_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
+AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
+[AC_REQUIRE([AC_PROG_F77])
+AC_LANG_PUSH(Fortran 77)
+
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+_LT_AC_TAGVAR(always_export_symbols, $1)=no
+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_direct, $1)=no
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+_LT_AC_TAGVAR(module_cmds, $1)=
+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_AC_TAGVAR(no_undefined_flag, $1)=
+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
 objext=o
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
+lt_simple_link_test_code="\
+      program t
+      end
+"
 
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
 
 # save warnings/boilerplate of simple test code
 _LT_COMPILER_BOILERPLATE
 _LT_LINKER_BOILERPLATE
 
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${F77-"f77"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
 
-# Report which library types will actually be built
 AC_MSG_CHECKING([if libtool supports shared libraries])
 AC_MSG_RESULT([$can_build_shared])
 
@@ -3830,12 +4092,11 @@
     postinstall_cmds='$RANLIB $lib'
   fi
   ;;
-
 aix4* | aix5*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
-    ;;
+  ;;
 esac
 AC_MSG_RESULT([$enable_shared])
 
@@ -3844,63 +4105,44 @@
 test "$enable_shared" = yes || enable_static=yes
 AC_MSG_RESULT([$enable_static])
 
+_LT_AC_TAGVAR(GCC, $1)="$G77"
+_LT_AC_TAGVAR(LD, $1)="$LD"
+
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+
 AC_LIBTOOL_CONFIG($1)
 
 AC_LANG_POP
 CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_C_CONFIG
+])# AC_LIBTOOL_LANG_F77_CONFIG
 
 
-# AC_LIBTOOL_LANG_CXX_CONFIG
+# AC_LIBTOOL_LANG_GCJ_CONFIG
 # --------------------------
 # Ensure that the configuration vars for the C compiler are
 # suitably defined.  Those variables are subsequently used by
 # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
-[AC_LANG_PUSH(C++)
-AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Dependencies to place before and after the object being linked:
-_LT_AC_TAGVAR(predep_objects, $1)=
-_LT_AC_TAGVAR(postdep_objects, $1)=
-_LT_AC_TAGVAR(predeps, $1)=
-_LT_AC_TAGVAR(postdeps, $1)=
-_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
+AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
+[AC_LANG_SAVE
 
-# Source file extension for C++ test sources.
-ac_ext=cpp
+# Source file extension for Java test sources.
+ac_ext=java
 
-# Object file extension for compiled C++ test sources.
+# Object file extension for compiled Java test sources.
 objext=o
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="class foo {}"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
@@ -3910,3609 +4152,3490 @@
 _LT_LINKER_BOILERPLATE
 
 # Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_LD=$LD
-lt_save_GCC=$GCC
-GCC=$GXX
-lt_save_with_gnu_ld=$with_gnu_ld
-lt_save_path_LD=$lt_cv_path_LD
-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-else
-  $as_unset lt_cv_prog_gnu_ld
-fi
-if test -n "${lt_cv_path_LDCXX+set}"; then
-  lt_cv_path_LD=$lt_cv_path_LDCXX
-else
-  $as_unset lt_cv_path_LD
-fi
-test -z "${LDCXX+set}" || LD=$LDCXX
-CC=${CXX-"c++"}
+lt_save_CC="$CC"
+CC=${GCJ-"gcj"}
 compiler=$CC
 _LT_AC_TAGVAR(compiler, $1)=$CC
 _LT_CC_BASENAME([$compiler])
 
-# We don't want -fno-exception wen compiling C++ code, so set the
-# no_builtin_flag separately
-if test "$GXX" = yes; then
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-else
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-fi
-
-if test "$GXX" = yes; then
-  # Set up default GNU C++ configuration
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 
-  AC_PROG_LD
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
 
-  # Check if GNU C++ uses GNU ld as the underlying linker, since the
-  # archiving commands below assume that GNU ld is being used.
-  if test "$with_gnu_ld" = yes; then
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
 
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+AC_LIBTOOL_CONFIG($1)
 
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-    #     investigate it a little bit more. (MM)
-    wlarc='${wl}'
+AC_LANG_RESTORE
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_GCJ_CONFIG
 
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
-	grep 'no-whole-archive' > /dev/null; then
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    with_gnu_ld=no
-    wlarc=
 
-    # A generic and very simple default shared library creation
-    # command for GNU C++ for the case where it uses the native
-    # linker, instead of GNU ld.  If possible, this setting should
-    # overridden to take advantage of the native linker features on
-    # the platform it is being used on.
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-  fi
+# AC_LIBTOOL_LANG_RC_CONFIG
+# -------------------------
+# Ensure that the configuration vars for the Windows resource compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
+AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
+[AC_LANG_SAVE
 
-  # Commands to make compiler produce verbose output that lists
-  # what "hidden" libraries, object files and flags are used when
-  # linking a shared library.
-  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+# Source file extension for RC test sources.
+ac_ext=rc
 
-else
-  GXX=no
-  with_gnu_ld=no
-  wlarc=
-fi
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
 
-# PORTME: fill in a description of your system's C++ link characteristics
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-case $host_os in
-  aix3*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  aix4* | aix5*)
-    if test "$host_cpu" = ia64; then
-      # On IA64, the linker does run time linking by default, so we don't
-      # have to do anything special.
-      aix_use_runtimelinking=no
-      exp_sym_flag='-Bexport'
-      no_entry_flag=""
-    else
-      aix_use_runtimelinking=no
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
 
-      # Test if we are trying to use run time linking or normal
-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-      # need to do runtime linking.
-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-	for ld_flag in $LDFLAGS; do
-	  case $ld_flag in
-	  *-brtl*)
-	    aix_use_runtimelinking=yes
-	    break
-	    ;;
-	  esac
-	done
-	;;
-      esac
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
 
-      exp_sym_flag='-bexport'
-      no_entry_flag='-bnoentry'
-    fi
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
 
-    # When large executables or shared objects are built, AIX ld can
-    # have problems creating the table of contents.  If linking a library
-    # or program results in "error TOC overflow" add -mminimal-toc to
-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
 
-    _LT_AC_TAGVAR(archive_cmds, $1)=''
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${RC-"windres"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
 
-    if test "$GXX" = yes; then
-      case $host_os in aix4.[[012]]|aix4.[[012]].*)
-      # We only want to do this on AIX 4.2 and lower, the check
-      # below for broken collect2 doesn't work under 4.3+
-	collect2name=`${CC} -print-prog-name=collect2`
-	if test -f "$collect2name" && \
-	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	then
-	  # We have reworked collect2
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	else
-	  # We have old collect2
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-	fi
-	;;
-      esac
-      shared_flag='-shared'
-      if test "$aix_use_runtimelinking" = yes; then
-	shared_flag="$shared_flag "'${wl}-G'
-      fi
-    else
-      # not using gcc
-      if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	shared_flag='-G'
-      else
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag='${wl}-G'
-	else
-	  shared_flag='${wl}-bM:SRE'
-	fi
-      fi
-    fi
+AC_LIBTOOL_CONFIG($1)
 
-    # It seems that -bexpall does not export symbols beginning with
-    # underscore (_), so it is better to generate a list of symbols to export.
-    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-    if test "$aix_use_runtimelinking" = yes; then
-      # Warning - without using the other runtime loading flags (-brtl),
-      # -berok will link without error, but may produce a broken library.
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-      # Determine the default libpath from the value encoded in an empty executable.
-      _LT_AC_SYS_LIBPATH_AIX
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+AC_LANG_RESTORE
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_RC_CONFIG
 
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-     else
-      if test "$host_cpu" = ia64; then
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-      else
-	# Determine the default libpath from the value encoded in an empty executable.
-	_LT_AC_SYS_LIBPATH_AIX
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	# Warning - without using the other run time loading flags,
-	# -berok will link without error, but may produce a broken library.
-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	# Exported symbols can be pulled into shared objects from archives
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	# This is similar to how AIX traditionally builds its shared libraries.
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-      fi
-    fi
-    ;;
 
-  beos*)
-    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-      # support --undefined.  This deserves some investigation.  FIXME
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-    ;;
+# AC_LIBTOOL_CONFIG([TAGNAME])
+# ----------------------------
+# If TAGNAME is not passed, then create an initial libtool script
+# with a default configuration from the untagged config vars.  Otherwise
+# add code to config.status for appending the configuration named by
+# TAGNAME from the matching tagged config vars.
+AC_DEFUN([AC_LIBTOOL_CONFIG],
+[# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+  # See if we are running on zsh, and set the options which allow our commands through
+  # without removal of \ escapes.
+  if test -n "${ZSH_VERSION+set}" ; then
+    setopt NO_GLOB_SUBST
+  fi
+  # Now quote all the things that may contain metacharacters while being
+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+  # variables and quote the copies for generation of the libtool script.
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+    SED SHELL STRIP \
+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+    deplibs_check_method reload_flag reload_cmds need_locks \
+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+    lt_cv_sys_global_symbol_to_c_name_address \
+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+    old_postinstall_cmds old_postuninstall_cmds \
+    _LT_AC_TAGVAR(compiler, $1) \
+    _LT_AC_TAGVAR(CC, $1) \
+    _LT_AC_TAGVAR(LD, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
+    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
+    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
+    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
+    _LT_AC_TAGVAR(old_archive_cmds, $1) \
+    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
+    _LT_AC_TAGVAR(predep_objects, $1) \
+    _LT_AC_TAGVAR(postdep_objects, $1) \
+    _LT_AC_TAGVAR(predeps, $1) \
+    _LT_AC_TAGVAR(postdeps, $1) \
+    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+    _LT_AC_TAGVAR(archive_cmds, $1) \
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
+    _LT_AC_TAGVAR(postinstall_cmds, $1) \
+    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
+    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
+    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
+    _LT_AC_TAGVAR(no_undefined_flag, $1) \
+    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
+    _LT_AC_TAGVAR(hardcode_automatic, $1) \
+    _LT_AC_TAGVAR(module_cmds, $1) \
+    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
+    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+    _LT_AC_TAGVAR(fix_srcfile_path, $1) \
+    _LT_AC_TAGVAR(exclude_expsyms, $1) \
+    _LT_AC_TAGVAR(include_expsyms, $1); do
 
-  chorus*)
-    case $cc_basename in
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
+    case $var in
+    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
+    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
+    _LT_AC_TAGVAR(archive_cmds, $1) | \
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
+    _LT_AC_TAGVAR(module_cmds, $1) | \
+    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
+    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
+    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+      # Double-quote double-evaled strings.
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+      ;;
+    *)
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      ;;
     esac
+  done
+
+  case $lt_echo in
+  *'\[$]0 --fallback-echo"')
+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
     ;;
+  esac
 
-  cygwin* | mingw* | pw32*)
-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-    # as there is no search path for DLLs.
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ifelse([$1], [],
+  [cfgfile="${ofile}T"
+  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
+  $rm -f "$cfgfile"
+  AC_MSG_NOTICE([creating $ofile])],
+  [cfgfile="$ofile"])
 
-    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      # If the export-symbols file already is a .def file (1st line
-      # is EXPORTS), use it as is; otherwise, prepend...
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	cp $export_symbols $output_objdir/$soname.def;
-      else
-	echo EXPORTS > $output_objdir/$soname.def;
-	cat $export_symbols >> $output_objdir/$soname.def;
-      fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-  ;;
-      darwin* | rhapsody*)
-        case $host_os in
-        rhapsody* | darwin1.[[012]])
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[[012]])
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-        esac
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+  cat <<__EOF__ >> "$cfgfile"
+ifelse([$1], [],
+[#! $SHELL
 
-    if test "$GXX" = yes ; then
-      lt_int_apple_cc_single_mod=no
-      output_verbose_link_cmd='echo'
-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-       lt_int_apple_cc_single_mod=yes
-      fi
-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      else
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-        fi
-        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          else
-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          fi
-            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-          ;;
-      esac
-      fi
-        ;;
+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+# Free Software Foundation, Inc.
+#
+# This file is part of GNU Libtool:
+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
 
-  dgux*)
-    case $cc_basename in
-      ec++*)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      ghcx*)
-	# Green Hills C++ Compiler
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  freebsd[[12]]*)
-    # C++ shared libraries reported to be fairly broken before switch to ELF
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  freebsd-elf*)
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    ;;
-  freebsd* | kfreebsd*-gnu | dragonfly*)
-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-    # conventions
-    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-    ;;
-  gnu*)
-    ;;
-  hpux9*)
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				# but as the default
-				# location of the library.
+# A sed program that does not truncate output.
+SED=$lt_SED
 
-    case $cc_basename in
-    CC*)
-      # FIXME: insert proper C++ library support
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    aCC*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      #
-      # There doesn't appear to be a way to prevent this compiler from
-      # explicitly linking system object files so we need to strip them
-      # from the output so that they don't get included in the library
-      # dependencies.
-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-      ;;
-    *)
-      if test "$GXX" = yes; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-        # FIXME: insert proper C++ library support
-        _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-    ;;
-  hpux10*|hpux11*)
-    if test $with_gnu_ld = no; then
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="$SED -e 1s/^X//"
 
-      case $host_cpu in
-      hppa*64*|ia64*)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-        ;;
-      *)
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-        ;;
-      esac
-    fi
-    case $host_cpu in
-    hppa*64*|ia64*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-    *)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
-      ;;
-    esac
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
-    case $cc_basename in
-      CC*)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      aCC*)
-	case $host_cpu in
-	hppa*64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	esac
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test $with_gnu_ld = no; then
-	    case $host_cpu in
-	    hppa*64*)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    ia64*)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    *)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    esac
-	  fi
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  interix3*)
-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-    # Instead, shared libraries are loaded at an image base (0x10000000 by
-    # default) and relocated if they conflict, which is a slow very memory
-    # consuming and fragmenting process.  To avoid this, we pick a random,
-    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-    ;;
-  irix5* | irix6*)
-    case $cc_basename in
-      CC*)
-	# SGI C++
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+# The names of the tagged configurations supported by this script.
+available_tags=
 
-	# Archives containing C++ object files must be created using
-	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test "$with_gnu_ld" = no; then
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	  else
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
-	  fi
-	fi
-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-	;;
-    esac
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-    ;;
-  linux*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
+# ### BEGIN LIBTOOL CONFIG],
+[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
 
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
 
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-	;;
-      icpc*)
-	# Intel C++
-	with_gnu_ld=yes
-	# version 8.0 and above of icpc choke on multiply defined symbols
-	# if we add $predep_objects and $postdep_objects, however 7.1 and
-	# earlier do not add the objects themselves.
-	case `$CC -V 2>&1` in
-	*"Version 7."*)
-  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  ;;
-	*)  # Version 8.0 or newer
-	  tmp_idyn=
-	  case $host_cpu in
-	    ia64*) tmp_idyn=' -i_dynamic';;
-	  esac
-  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  ;;
-	esac
-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	;;
-      pgCC*)
-        # Portland Group C++ compiler
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
 
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-        ;;
-      cxx*)
-	# Compaq C++
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
 
-	runpath_var=LD_RUN_PATH
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
 
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-    esac
-    ;;
-  lynxos*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  m88k*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  mvs*)
-    case $cc_basename in
-      cxx*)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  netbsd*)
-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-      wlarc=
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    fi
-    # Workaround some broken pre-1.5 toolchains
-    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-    ;;
-  openbsd2*)
-    # C++ shared libraries are fairly broken
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  openbsd*)
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    fi
-    output_verbose_link_cmd='echo'
-    ;;
-  osf3*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
 
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
 
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
 
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
 
-	;;
-      RCC*)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      cxx*)
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
 
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
 
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+# A C compiler.
+LTCC=$lt_LTCC
 
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
 
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+# A language-specific compiler.
+CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
 
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  osf4* | osf5*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
+# Is the compiler the GNU C compiler?
+with_gcc=$_LT_AC_TAGVAR(GCC, $1)
 
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+# An ERE matcher.
+EGREP=$lt_EGREP
 
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+# The linker used to build libraries.
+LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
 
-	# Archives containing C++ object files must be created using
-	# the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
-	;;
-      RCC*)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      cxx*)
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	  echo "-hidden">> $lib.exp~
-	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
-	  $rm $lib.exp'
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
 
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+# A BSD-compatible nm program.
+NM=$lt_NM
 
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+# A symbol stripping program
+STRIP=$lt_STRIP
 
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
 
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
 
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  psos*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  sunos4*)
-    case $cc_basename in
-      CC*)
-	# Sun C++ 4.x
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      lcc*)
-	# Lucid
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  solaris*)
-    case $cc_basename in
-      CC*)
-	# Sun C++ 4.2, 5.x and Centerline C++
-        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
 
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	case $host_os in
-	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-	  *)
-	    # The C++ compiler is used as linker so we must use $wl
-	    # flag to pass the commands to the underlying system
-	    # linker. We must also pass each convience library through
-	    # to the system linker between allextract/defaultextract.
-	    # The C++ compiler will combine linker options so we
-	    # cannot just pass the convience library names through
-	    # without $wl.
-	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
-	    ;;
-	esac
-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+# Used on cygwin: assembler.
+AS="$AS"
 
-	output_verbose_link_cmd='echo'
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
 
-	# Archives containing C++ object files must be created using
-	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	;;
-      gcx*)
-	# Green Hills C++ Compiler
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
 
-	# The C++ compiler must be used to create the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	;;
-      *)
-	# GNU C++ compiler with Solaris linker
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-	  if $CC --version | grep -v '^2\.7' > /dev/null; then
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+# How to pass a linker flag through the compiler.
+wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
 
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  else
-	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	    # platform.
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+# Object file suffix (normally "o").
+objext="$ac_objext"
 
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  fi
+# Old archive suffix (normally "a").
+libext="$libext"
 
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-	fi
-	;;
-    esac
-    ;;
-  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    runpath_var='LD_RUN_PATH'
+# Shared library suffix (normally ".so").
+shrext_cmds='$shrext_cmds'
 
-    case $cc_basename in
-      CC*)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      *)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-    esac
-    ;;
-  sysv5* | sco3.2v5* | sco5v6*)
-    # Note: We can NOT use -z defs as we might desire, because we do not
-    # link with -lc, and that would cause any symbols used from libc to
-    # always be unresolved, which means just about no library would
-    # ever link correctly.  If we're not using GNU ld we use -z text
-    # though, which does catch some bad symbols but isn't as heavy-handed
-    # as -z defs.
-    # For security reasons, it is highly recommended that you always
-    # use absolute paths for naming shared libraries, and exclude the
-    # DT_RUNPATH tag from executables and libraries.  But doing so
-    # requires that you compile everything twice, which is a pain.
-    # So that behaviour is only enabled if SCOABSPATH is set to a
-    # non-empty value in the environment.  Most likely only useful for
-    # creating official distributions of packages.
-    # This is a hack until libtool officially supports absolute path
-    # names for shared libraries.
-    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-    runpath_var='LD_RUN_PATH'
+# Executable file suffix (normally "").
+exeext="$exeext"
 
-    case $cc_basename in
-      CC*)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      *)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-    esac
-    ;;
-  tandem*)
-    case $cc_basename in
-      NCC*)
-	# NonStop-UX NCC 3.20
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  vxworks*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  *)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-esac
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+# Additional compiler flags for building library objects.
+pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+pic_mode=$pic_mode
 
-_LT_AC_TAGVAR(GCC, $1)="$GXX"
-_LT_AC_TAGVAR(LD, $1)="$LD"
+# What is the maximum length of a command?
+max_cmd_len=$lt_cv_sys_max_cmd_len
 
-AC_LIBTOOL_POSTDEP_PREDEP($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
 
-AC_LIBTOOL_CONFIG($1)
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
 
-AC_LANG_POP
-CC=$lt_save_CC
-LDCXX=$LD
-LD=$lt_save_LD
-GCC=$lt_save_GCC
-with_gnu_ldcxx=$with_gnu_ld
-with_gnu_ld=$lt_save_with_gnu_ld
-lt_cv_path_LDCXX=$lt_cv_path_LD
-lt_cv_path_LD=$lt_save_path_LD
-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-])# AC_LIBTOOL_LANG_CXX_CONFIG
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
 
-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
-# ------------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library.  It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
-int a;
-void foo (void) { a = 0; }
-EOF
-],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-EOF
-],[$1],[F77],[cat > conftest.$ac_ext <<EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-EOF
-],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-EOF
-])
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
+# Do we need a version for libraries?
+need_version=$need_version
 
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
 
-  # The `*' in the case matches for architectures that use `case' in
-  # $output_verbose_cmd can trigger glob expansion during the loop
-  # eval without this substitution.
-  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
 
-  for p in `eval $output_verbose_link_cmd`; do
-    case $p in
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
 
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" \
-	  || test $p = "-R"; then
-	 prev=$p
-	 continue
-       else
-	 prev=
-       fi
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
 
-       if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-	   else
-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
-	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
-	 else
-	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
-	 fi
-       fi
-       ;;
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
 
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
 
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
-	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
-	 else
-	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
-	 fi
-       else
-	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
-	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
-	 else
-	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
-	 fi
-       fi
-       ;;
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
 
-    *) ;; # Ignore the rest.
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
 
-    esac
-  done
+# Library versioning type.
+version_type=$version_type
 
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
 
-$rm -f confest.$objext
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
 
-# PORTME: override above test on systems where it is broken
-ifelse([$1],[CXX],
-[case $host_os in
-interix3*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  _LT_AC_TAGVAR(predep_objects,$1)=
-  _LT_AC_TAGVAR(postdep_objects,$1)=
-  _LT_AC_TAGVAR(postdeps,$1)=
-  ;;
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
 
-solaris*)
-  case $cc_basename in
-  CC*)
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
-    ;;
-  esac
-  ;;
-esac
-])
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
 
-case " $_LT_AC_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
-])# AC_LIBTOOL_POSTDEP_PREDEP
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
 
-# AC_LIBTOOL_LANG_F77_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
-AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
-[AC_REQUIRE([AC_PROG_F77])
-AC_LANG_PUSH(Fortran 77)
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
 
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
+archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
 
-# Source file extension for f77 test sources.
-ac_ext=f
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
+module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
 
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
 
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
 
-# Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
 
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
 
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
 
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${F77-"f77"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
 
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
 
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
 
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-aix4* | aix5*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-  ;;
-esac
-AC_MSG_RESULT([$enable_shared])
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
 
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
 
-_LT_AC_TAGVAR(GCC, $1)="$G77"
-_LT_AC_TAGVAR(LD, $1)="$LD"
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
 
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_F77_CONFIG
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
 
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
 
-# AC_LIBTOOL_LANG_GCJ_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
-AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
-[AC_LANG_SAVE
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
 
-# Source file extension for Java test sources.
-ac_ext=java
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
 
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
 
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
 
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
 
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
+# How to hardcode a shared library path into an executable.
+hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
 
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
 
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${GCJ-"gcj"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
 
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
 
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
 
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
 
-AC_LIBTOOL_CONFIG($1)
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
 
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_GCJ_CONFIG
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
 
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
 
-# AC_LIBTOOL_LANG_RC_CONFIG
-# -------------------------
-# Ensure that the configuration vars for the Windows resource compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
-AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
-[AC_LANG_SAVE
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
 
-# Source file extension for RC test sources.
-ac_ext=rc
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
 
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path
 
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
+# Set to yes if exported symbols are required.
+always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
 
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
 
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${RC-"windres"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
 
-AC_LIBTOOL_CONFIG($1)
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
 
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_RC_CONFIG
+# Symbols that must always be exported.
+include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
 
+ifelse([$1],[],
+[# ### END LIBTOOL CONFIG],
+[# ### END LIBTOOL TAG CONFIG: $tagname])
 
-# AC_LIBTOOL_CONFIG([TAGNAME])
-# ----------------------------
-# If TAGNAME is not passed, then create an initial libtool script
-# with a default configuration from the untagged config vars.  Otherwise
-# add code to config.status for appending the configuration named by
-# TAGNAME from the matching tagged config vars.
-AC_DEFUN([AC_LIBTOOL_CONFIG],
-[# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    _LT_AC_TAGVAR(compiler, $1) \
-    _LT_AC_TAGVAR(CC, $1) \
-    _LT_AC_TAGVAR(LD, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
-    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
-    _LT_AC_TAGVAR(old_archive_cmds, $1) \
-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
-    _LT_AC_TAGVAR(predep_objects, $1) \
-    _LT_AC_TAGVAR(postdep_objects, $1) \
-    _LT_AC_TAGVAR(predeps, $1) \
-    _LT_AC_TAGVAR(postdeps, $1) \
-    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
-    _LT_AC_TAGVAR(archive_cmds, $1) \
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
-    _LT_AC_TAGVAR(postinstall_cmds, $1) \
-    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
-    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
-    _LT_AC_TAGVAR(no_undefined_flag, $1) \
-    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
-    _LT_AC_TAGVAR(hardcode_automatic, $1) \
-    _LT_AC_TAGVAR(module_cmds, $1) \
-    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
-    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
-    _LT_AC_TAGVAR(exclude_expsyms, $1) \
-    _LT_AC_TAGVAR(include_expsyms, $1); do
+__EOF__
 
-    case $var in
-    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
-    _LT_AC_TAGVAR(archive_cmds, $1) | \
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
-    _LT_AC_TAGVAR(module_cmds, $1) | \
-    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
-    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
+ifelse([$1],[], [
+  case $host_os in
+  aix3*)
+    cat <<\EOF >> "$cfgfile"
 
-  case $lt_echo in
-  *'\[$]0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+EOF
     ;;
   esac
 
-ifelse([$1], [],
-  [cfgfile="${ofile}T"
-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-  $rm -f "$cfgfile"
-  AC_MSG_NOTICE([creating $ofile])],
-  [cfgfile="$ofile"])
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
 
-  cat <<__EOF__ >> "$cfgfile"
-ifelse([$1], [],
-[#! $SHELL
-
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Libtool:
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e 1s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# The names of the tagged configurations supported by this script.
-available_tags=
+  mv -f "$cfgfile" "$ofile" || \
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+])
+else
+  # If there is no Makefile yet, we rely on a make rule to execute
+  # `config.status --recheck' to rerun these tests and create the
+  # libtool script then.
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
+fi
+])# AC_LIBTOOL_CONFIG
 
-# ### BEGIN LIBTOOL CONFIG],
-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
 
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------------------
+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
 
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
+_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
 
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
+if test "$GCC" = yes; then
+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
 
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
+  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
 
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
 
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
+# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+# ---------------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+[AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([LT_AC_PROG_SED])
+AC_REQUIRE([AC_PROG_NM])
+AC_REQUIRE([AC_OBJEXT])
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
 
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
 
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
 
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
+# Transform an extracted symbol line into a proper C declaration
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
 
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
 
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*) # Its linker distinguishes data from code symbols
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+  ;;
+linux* | k*bsd*-gnu)
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDGIRSTW]]'
+    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
+  ;;
+solaris*)
+  symcode='[[BDRT]]'
+  ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
 
-# A C compiler.
-LTCC=$lt_LTCC
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
 
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
 
-# A language-specific compiler.
-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+# Try without a prefix undercore, then with it.
+for ac_symprfx in "" "_"; do
 
-# Is the compiler the GNU C compiler?
-with_gcc=$_LT_AC_TAGVAR(GCC, $1)
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
 
-# An ERE matcher.
-EGREP=$lt_EGREP
+  # Write the raw and C identifiers.
+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
 
-# The linker used to build libraries.
-LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
+  # Check to see that the pipe works correctly.
+  pipe_works=no
 
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
+  rm -f conftest*
+  cat > conftest.$ac_ext <<EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+EOF
 
-# A BSD-compatible nm program.
-NM=$lt_NM
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
 
-# A symbol stripping program
-STRIP=$lt_STRIP
+      # Make sure that we snagged all the symbols we need.
+      if grep ' nm_test_var$' "$nlist" >/dev/null; then
+	if grep ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
+EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
 
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
+	  cat <<EOF >> conftest.$ac_ext
+#if defined (__STDC__) && __STDC__
+# define lt_ptr_t void *
+#else
+# define lt_ptr_t char *
+# define const
+#endif
 
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
+/* The mapping between symbol names and symbols. */
+const struct {
+  const char *name;
+  lt_ptr_t address;
+}
+lt_preloaded_symbols[[]] =
+{
+EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
+	  cat <<\EOF >> conftest.$ac_ext
+  {0, (lt_ptr_t) 0}
+};
 
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+#ifdef __cplusplus
+}
+#endif
+EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_save_LIBS="$LIBS"
+	  lt_save_CFLAGS="$CFLAGS"
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS="$lt_save_LIBS"
+	  CFLAGS="$lt_save_CFLAGS"
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -f conftest* conftst*
 
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
 
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
 
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
+# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
+# ---------------------------------------
+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
+[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
 
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
+AC_MSG_CHECKING([for $compiler option to produce PIC])
+ ifelse([$1],[CXX],[
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
 
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+      ;;
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+    *)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix4* | aix5*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	else
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+       darwin*)
+         # PIC is the default on this platform
+         # Common symbols not allowed in MH_DYLIB files
+         case $cc_basename in
+           xlc*)
+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           ;;
+         esac
+       ;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    if test "$host_cpu" != ia64; then
+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  icpc* | ecpc*)
+	    # Intel C++
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  pgCC*)
+	    # Portland Group C++ compiler.
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd* | netbsdelf*-gnu)
+	;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	;;
+    esac
+  fi
+],
+[
+  if test "$GCC" = yes; then
+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
 
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
 
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+      ;;
 
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
 
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+    mingw* | cygwin* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      ;;
 
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
 
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
 
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
 
-# How to hardcode a shared library path into an executable.
-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
 
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
+    hpux*)
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
 
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
+    *)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+      darwin*)
+        # PIC is the default on this platform
+        # Common symbols not allowed in MH_DYLIB files
+       case $cc_basename in
+         xlc*)
+         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+         ;;
+       esac
+       ;;
 
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
+    mingw* | cygwin* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      ;;
 
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
+    hpux9* | hpux10* | hpux11*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+      ;;
 
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
+    irix5* | irix6* | nonstopux*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
 
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
+    newsos6)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
 
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
+    linux* | k*bsd*-gnu)
+      case $cc_basename in
+      icc* | ecc*)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      ccc*)
+        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	esac
+	;;
+      esac
+      ;;
 
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
+    osf3* | osf4* | osf5*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
 
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
+    rdos*)
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
 
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
+    solaris*)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
+      ;;
 
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+    sunos4*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
 
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
 
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
 
-# Set to yes if exported symbols are required.
-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
 
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
+    unicos*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
 
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
+    uts4*)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
 
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
+    *)
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
 
-# Symbols that must always be exported.
-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
+    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
+    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
 
-ifelse([$1],[],
-[# ### END LIBTOOL CONFIG],
-[# ### END LIBTOOL TAG CONFIG: $tagname])
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+])
 
-__EOF__
 
-ifelse([$1],[], [
+# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
+# ------------------------------------
+# See if the linker supports building shared libraries.
+AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ifelse([$1],[CXX],[
+  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
-  aix3*)
-    cat <<\EOF >> "$cfgfile"
-
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-EOF
+  aix4* | aix5*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+  ;;
+  cygwin* | mingw*)
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+  ;;
+  linux* | k*bsd*-gnu)
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+  ;;
+  *)
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  esac
+],[
+  runpath_var=
+  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_AC_TAGVAR(archive_cmds, $1)=
+  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
+  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+  _LT_AC_TAGVAR(module_cmds, $1)=
+  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+  _LT_AC_TAGVAR(always_export_symbols, $1)=no
+  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_AC_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  extract_expsyms_cmds=
+  # Just being paranoid about ensuring that cc_basename is set.
+  _LT_CC_BASENAME([$compiler])
+  case $host_os in
+  cygwin* | mingw* | pw32*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
     ;;
   esac
 
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
+  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+  if test "$with_gnu_ld" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
 
-  mv -f "$cfgfile" "$ofile" || \
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-])
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-])# AC_LIBTOOL_CONFIG
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>/dev/null` in
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
 
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix3* | aix4* | aix5*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	cat <<EOF 1>&2
 
-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
 
-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+EOF
+      fi
+      ;;
 
-if test "$GCC" = yes; then
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+    amigaos*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
 
-  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-    lt_cv_prog_compiler_rtti_exceptions,
-    [-fno-rtti -fno-exceptions], [],
-    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we can't use
+      # them.
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
 
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
 
-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-# ---------------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
-[AC_REQUIRE([AC_CANONICAL_HOST])
-AC_REQUIRE([AC_PROG_NM])
-AC_REQUIRE([AC_OBJEXT])
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+    cygwin* | mingw* | pw32*)
+      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_AC_TAGVAR(always_export_symbols, $1)=no
+      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
 
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+    interix[[3-9]]*)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
 
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+    gnu* | linux* | k*bsd*-gnu)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	tmp_addflag=
+	case $cc_basename,$host_cpu in
+	pgcc*)				# Portland Group C compiler
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+	if test $supports_anon_versioning = yes; then
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+  $echo "local: *; };" >> $output_objdir/$libname.ver~
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	fi
+	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
 
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[[BCDT]]'
-  ;;
-cygwin* | mingw* | pw32*)
-  symcode='[[ABCDGISTW]]'
-  ;;
-hpux*) # Its linker distinguishes data from code symbols
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDEGRST]]'
-  fi
-  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  ;;
-linux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDGIRSTW]]'
-    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris*)
-  symcode='[[BDRT]]'
-  ;;
-sco3.2v5*)
-  symcode='[[DT]]'
-  ;;
-sysv4.2uw2*)
-  symcode='[[DT]]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[[ABDT]]'
-  ;;
-sysv4)
-  symcode='[[DFNSTU]]'
-  ;;
-esac
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
 
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
+    solaris*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	cat <<EOF 1>&2
 
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[[ABCDGIRSTW]]' ;;
-esac
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
 
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
+EOF
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
 
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
 
-  # Write the raw and C identifiers.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
 
-  # Check to see that the pipe works correctly.
-  pipe_works=no
+_LT_EOF
+	;;
+	*)
+	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+	  else
+	    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	;;
+      esac
+      ;;
 
-  rm -f conftest*
-  cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
+    sunos4*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
 
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
+    *)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
-	rm -f "$nlist"T
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
       fi
+      ;;
+    esac
 
-      # Make sure that we snagged all the symbols we need.
-      if grep ' nm_test_var$' "$nlist" >/dev/null; then
-	if grep ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
+    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
+      runpath_var=
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
+
+    aix4* | aix5*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+	else
+	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+	  for ld_flag in $LDFLAGS; do
+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+  	    aix_use_runtimelinking=yes
+  	    break
+  	  fi
+	  done
+	  ;;
+	esac
 
-EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
 
-	  cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
 
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr_t address;
-}
-lt_preloaded_symbols[[]] =
-{
-EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
-	  cat <<\EOF >> conftest.$ac_ext
-  {0, (lt_ptr_t) 0}
-};
+      _LT_AC_TAGVAR(archive_cmds, $1)=''
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 
-#ifdef __cplusplus
-}
-#endif
-EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" && \
+  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	  then
+  	  # We have reworked collect2
+  	  :
+	  else
+  	  # We have old collect2
+  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+  	  # It fails to find uninstalled libraries when the uninstalled
+  	  # path is not listed in the libpath.  Setting hardcode_minus_L
+  	  # to unsupported forces relinking
+  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
 	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
 	fi
       else
-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+  	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
       fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-    fi
-  else
-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-    cat conftest.$ac_ext >&5
-  fi
-  rm -f conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  AC_MSG_RESULT(failed)
-else
-  AC_MSG_RESULT(ok)
-fi
-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-
-
-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
-# ---------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
-
-AC_MSG_CHECKING([for $compiler option to produce PIC])
- ifelse([$1],[CXX],[
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
 
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+       # Determine the default libpath from the value encoded in an empty executable.
+       _LT_AC_SYS_LIBPATH_AIX
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+       else
+	if test "$host_cpu" = ia64; then
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an empty executable.
+	 _LT_AC_SYS_LIBPATH_AIX
+	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	  # Exported symbols can be pulled into shared objects from archives
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
       fi
       ;;
+
     amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      # see comment about different semantics on the GNU ld section
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
       ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
+
+    bsdi[[45]]*)
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
       ;;
-    mingw* | os2* | pw32*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+
+    cygwin* | mingw* | pw32*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext_cmds=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+      # FIXME: Should let the user specify the lib program.
+      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       ;;
+
     darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      case $host_os in
+        rhapsody* | darwin1.[[012]])
+         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[[012]])
+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
+      esac
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+    if test "$GCC" = yes ; then
+    	output_verbose_link_cmd='echo'
+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    else
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+          ;;
+      esac
+    fi
+      ;;
+
+    dgux*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+
+    freebsd1*)
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
       ;;
-    interix3*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
       ;;
-    esac
-  else
-    case $host_os in
-      aix4* | aix5*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	else
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-       darwin*)
-         # PIC is the default on this platform
-         # Common symbols not allowed in MH_DYLIB files
-         case $cc_basename in
-           xlc*)
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           ;;
-         esac
-       ;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | kfreebsd*-gnu | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux*)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  icpc* | ecpc*)
-	    # Intel C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  pgCC*)
-	    # Portland Group C++ compiler.
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd*)
-	;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
+
+    hpux10*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
 	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  *)
-	    ;;
+      else
+	case $host_cpu in
+	hppa*64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
 	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
 	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	     _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	     ;;
+	   *)
+	     _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    os2*)
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      else
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    solaris*)
+      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+      else
+	wlarc=''
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
 	;;
-      vxworks*)
+      esac
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
 	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+        ;;
+	motorola)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
 	;;
-    esac
-  fi
-],
-[
-  if test "$GCC" = yes; then
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
 
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
       ;;
 
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+    uts4*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
+    *)
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
       ;;
+    esac
+  fi
+])
+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
 
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-      ;;
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
 
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $_LT_AC_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
       ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+      $rm conftest*
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-    interix3*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
+      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
+        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
+        then
+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+        else
+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+        fi
+        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $rm conftest*
+      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
       ;;
+    esac
+  fi
+  ;;
+esac
+])# AC_LIBTOOL_PROG_LD_SHLIBS
 
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
-      ;;
 
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
+# _LT_AC_FILE_LTDLL_C
+# -------------------
+# Be careful that the start marker always follows a newline.
+AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
+# /* ltdll.c starts here */
+# #define WIN32_LEAN_AND_MEAN
+# #include <windows.h>
+# #undef WIN32_LEAN_AND_MEAN
+# #include <stdio.h>
+#
+# #ifndef __CYGWIN__
+# #  ifdef __CYGWIN32__
+# #    define __CYGWIN__ __CYGWIN32__
+# #  endif
+# #endif
+#
+# #ifdef __cplusplus
+# extern "C" {
+# #endif
+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
+# #ifdef __cplusplus
+# }
+# #endif
+#
+# #ifdef __CYGWIN__
+# #include <cygwin/cygwin_dll.h>
+# DECLARE_CYGWIN_DLL( DllMain );
+# #endif
+# HINSTANCE __hDllInstance_base;
+#
+# BOOL APIENTRY
+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
+# {
+#   __hDllInstance_base = hInst;
+#   return TRUE;
+# }
+# /* ltdll.c ends here */
+])# _LT_AC_FILE_LTDLL_C
+
+
+# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
+# ---------------------------------
+AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
+
+
+# old names
+AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
+AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
+AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
+AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
+
+# This is just to silence aclocal about the macro not being used
+ifelse([AC_DISABLE_FAST_INSTALL])
+
+AC_DEFUN([LT_AC_PROG_GCJ],
+[AC_CHECK_TOOL(GCJ, gcj, no)
+  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+  AC_SUBST(GCJFLAGS)
+])
+
+AC_DEFUN([LT_AC_PROG_RC],
+[AC_CHECK_TOOL(RC, windres, no)
+])
+
+
+# Cheap backport of AS_EXECUTABLE_P and required macros
+# from Autoconf 2.59; we should not use $as_executable_p directly.
+
+# _AS_TEST_PREPARE
+# ----------------
+m4_ifndef([_AS_TEST_PREPARE],
+[m4_defun([_AS_TEST_PREPARE],
+[if test -x / >/dev/null 2>&1; then
+  as_executable_p='test -x'
+else
+  as_executable_p='test -f'
+fi
+])])# _AS_TEST_PREPARE
+
+# AS_EXECUTABLE_P
+# ---------------
+# Check whether a file is executable.
+m4_ifndef([AS_EXECUTABLE_P],
+[m4_defun([AS_EXECUTABLE_P],
+[AS_REQUIRE([_AS_TEST_PREPARE])dnl
+$as_executable_p $1[]dnl
+])])# AS_EXECUTABLE_P
+
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+# LT_AC_PROG_SED
+# --------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+AC_DEFUN([LT_AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f $lt_ac_sed && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test $lt_ac_count -gt 10 && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test $lt_ac_count -gt $lt_ac_max; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])
+
+# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.10'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.10], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+[AM_AUTOMAKE_VERSION([1.10])dnl
+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      else
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-      darwin*)
-        # PIC is the default on this platform
-        # Common symbols not allowed in MH_DYLIB files
-       case $cc_basename in
-         xlc*)
-         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-         ;;
-       esac
-       ;;
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
 
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-      ;;
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
 
-    hpux9* | hpux10* | hpux11*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-      ;;
+# AM_CONDITIONAL                                            -*- Autoconf -*-
 
-    irix5* | irix6* | nonstopux*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC (with -KPIC) is the default.
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-    newsos6)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
+# serial 8
 
-    linux*)
-      case $cc_basename in
-      icc* | ecc*)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-        ;;
-      ccc*)
-        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-        # All Alpha code is PIC.
-        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-        ;;
-      esac
-      ;;
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
 
-    osf3* | osf4* | osf5*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # All OSF/1 code is PIC.
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-    solaris*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-      esac
-      ;;
+# serial 9
 
-    sunos4*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
 
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
 
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
 
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                   [depcc="$$1"   am_compiler_list=])
 
-    unicos*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
 
-    uts4*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
+  am_cv_$1_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+    case $depmode in
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
       ;;
+    none) break ;;
     esac
-  fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
+    if depmode=$depmode \
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
 
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
-    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
-    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
-     "" | " "*) ;;
-     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-     esac],
-    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_$1_dependencies_compiler_type=none
 fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-    ;;
-  *)
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
-    ;;
-esac
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
-  $lt_tmp_static_flag,
-  [],
-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
 ])
 
 
-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
-# ------------------------------------
-# See if the linker supports building shared libraries.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-ifelse([$1],[CXX],[
-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  case $host_os in
-  aix4* | aix5*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-    else
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-  ;;
-  cygwin* | mingw*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  *)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  esac
-],[
-  runpath_var=
-  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_AC_TAGVAR(archive_cmds, $1)=
-  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
-  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
-  _LT_AC_TAGVAR(module_cmds, $1)=
-  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
-  _LT_AC_TAGVAR(always_export_symbols, $1)=no
-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  _LT_AC_TAGVAR(include_expsyms, $1)=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  extract_expsyms_cmds=
-  # Just being paranoid about ensuring that cc_basename is set.
-  _LT_CC_BASENAME([$compiler])
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>/dev/null` in
-      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+AC_DEFUN([AM_SET_DEPDIR],
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
 
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix3* | aix4* | aix5*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<EOF 1>&2
 
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE(dependency-tracking,
+[  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors])
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+])
 
-EOF
-      fi
-      ;;
+# Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-    amigaos*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
+#serial 3
 
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[for mf in $CONFIG_FILES; do
+  # Strip MF so we end up with the name of the file.
+  mf=`echo "$mf" | sed -e 's/:.*$//'`
+  # Check whether this is an Automake generated Makefile or not.
+  # We used to match only the files named `Makefile.in', but
+  # some people rename them; so instead we look at the file content.
+  # Grep'ing the first line is not enough: some people post-process
+  # each Makefile.in and add a new line on top of each file to say so.
+  # Grep'ing the whole file is not good either: AIX grep has a line
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+    dirpart=`AS_DIRNAME("$mf")`
+  else
+    continue
+  fi
+  # Extract the definition of DEPDIR, am__include, and am__quote
+  # from the Makefile without running `make'.
+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+  test -z "$DEPDIR" && continue
+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
+  test -z "am__include" && continue
+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+  # When using ansi2knr, U may be empty or an underscore; expand it
+  U=`sed -n 's/^U = //p' < "$mf"`
+  # Find all dependency output files, they are included files with
+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
+  # simplest approach to changing $(DEPDIR) to its actual value in the
+  # expansion.
+  for file in `sed -n "
+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+    # Make sure the directory exists.
+    test -f "$dirpart/$file" && continue
+    fdir=`AS_DIRNAME(["$file"])`
+    AS_MKDIR_P([$dirpart/$fdir])
+    # echo "creating $dirpart/$file"
+    echo '# dummy' > "$dirpart/$file"
+  done
+done
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
 
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-      # as there is no search path for DLLs.
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(always_export_symbols, $1)=no
-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
 
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
+# is enabled.  FIXME.  This creates each `.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
 
-    interix3*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-    linux*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	tmp_addflag=
-	case $cc_basename,$host_cpu in
-	pgcc*)				# Portland Group C compiler
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	esac
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+# serial 8
 
-	if test $supports_anon_versioning = yes; then
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-  $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	fi
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
+# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
 
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
+# Do all the work for Automake.                             -*- Autoconf -*-
 
-    solaris*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<EOF 1>&2
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
+# serial 12
 
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
+# This macro actually does too much.  Some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
 
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition.  After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.60])dnl
+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
+fi
 
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
 
-_LT_EOF
-	;;
-	*)
-	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-	  else
-	    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	;;
-      esac
-      ;;
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
-    sunos4*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
 
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_PROG_INSTALL_SH
+AM_PROG_INSTALL_STRIP
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+	      		     [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+                  [_AM_DEPENDENCIES(CC)],
+                  [define([AC_PROG_CC],
+                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+                  [_AM_DEPENDENCIES(CXX)],
+                  [define([AC_PROG_CXX],
+                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+                  [_AM_DEPENDENCIES(OBJC)],
+                  [define([AC_PROG_OBJC],
+                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+])
+])
 
-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
-      runpath_var=
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-      fi
-      ;;
 
-    aix4* | aix5*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-	else
-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  The stamp files are numbered to have different names.
 
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
-	  done
-	  ;;
-	esac
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $1 | $1:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
 
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+AC_SUBST(install_sh)])
 
-      _LT_AC_TAGVAR(archive_cmds, $1)=''
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[[012]]|aix4.[[012]].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	  then
-  	  # We have reworked collect2
-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	  else
-  	  # We have old collect2
-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
+# serial 2
 
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       _LT_AC_SYS_LIBPATH_AIX
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-	if test "$host_cpu" = ia64; then
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 _LT_AC_SYS_LIBPATH_AIX
-	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
+# Check whether the underlying file-system supports filenames
+# with a leading dot.  For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
 
-    amigaos*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      # see comment about different semantics on the GNU ld section
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
+# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-    bsdi[[45]]*)
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
+# serial 5
 
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
-      # FIXME: Should let the user specify the lib program.
-      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      ;;
+# AM_PROG_LEX
+# -----------
+# Autoconf leaves LEX=: if lex or flex can't be found.  Change that to a
+# "missing" invocation, for better error output.
+AC_DEFUN([AM_PROG_LEX],
+[AC_PREREQ(2.50)dnl
+AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
+AC_REQUIRE([AC_PROG_LEX])dnl
+if test "$LEX" = :; then
+  LEX=${am_missing_run}flex
+fi])
 
-    darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[[012]])
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[[012]])
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-    if test "$GCC" = yes ; then
-    	output_verbose_link_cmd='echo'
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-          ;;
-      esac
-    fi
-      ;;
+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 3
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo done
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+   am__include=include
+   am__quote=
+   _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+      am__include=.include
+      am__quote="\""
+      _am_result=BSD
+   fi
+fi
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
+])
 
-    dgux*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-    freebsd1*)
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
+# serial 5
 
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
 
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
 
-    hpux9*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  AC_MSG_WARN([`missing' script is too old or missing])
+fi
+])
 
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      ;;
+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+# AM_PROG_MKDIR_P
+# ---------------
+# Check for `mkdir -p'.
+AC_DEFUN([AM_PROG_MKDIR_P],
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
 
-	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+# Helper functions for option handling.                     -*- Autoconf -*-
 
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      fi
-      ;;
+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+# serial 3
 
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	esac
-      fi
-      ;;
+# _AM_SET_OPTION(NAME)
+# ------------------------------
+# Set option NAME.  Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
 
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
+# _AM_SET_OPTIONS(OPTIONS)
+# ----------------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
 
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-    newsos6)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# ---------------------------------------------------------------------------
+# Adds support for distributing Python modules and packages.  To
+# install modules, copy them to $(pythondir), using the python_PYTHON
+# automake variable.  To install a package with the same name as the
+# automake package, install to $(pkgpythondir), or use the
+# pkgpython_PYTHON automake variable.
+#
+# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as
+# locations to install python extension modules (shared libraries).
+# Another macro is required to find the appropriate flags to compile
+# extension modules.
+#
+# If your package is configured with a different prefix to python,
+# users will have to add the install directory to the PYTHONPATH
+# environment variable, or create a .pth file (see the python
+# documentation for details).
+#
+# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will
+# cause an error if the version of python installed on the system
+# doesn't meet the requirement.  MINIMUM-VERSION should consist of
+# numbers and dots only.
+AC_DEFUN([AM_PATH_PYTHON],
+ [
+  dnl Find a Python interpreter.  Python versions prior to 1.5 are not
+  dnl supported because the default installation locations changed from
+  dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages
+  dnl in 1.5.
+  m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
+                    [python python2 python2.5 python2.4 python2.3 python2.2 dnl
+python2.1 python2.0 python1.6 python1.5])
 
-    openbsd*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+  m4_if([$1],[],[
+    dnl No version check is needed.
+    # Find any Python interpreter.
+    if test -z "$PYTHON"; then
+      AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :)
+    fi
+    am_display_PYTHON=python
+  ], [
+    dnl A version check is needed.
+    if test -n "$PYTHON"; then
+      # If the user set $PYTHON, use it and don't search something else.
+      AC_MSG_CHECKING([whether $PYTHON version >= $1])
+      AM_PYTHON_CHECK_VERSION([$PYTHON], [$1],
+			      [AC_MSG_RESULT(yes)],
+			      [AC_MSG_ERROR(too old)])
+      am_display_PYTHON=$PYTHON
+    else
+      # Otherwise, try each interpreter until we find one that satisfies
+      # VERSION.
+      AC_CACHE_CHECK([for a Python interpreter with version >= $1],
+	[am_cv_pathless_PYTHON],[
+	for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do
+	  test "$am_cv_pathless_PYTHON" = none && break
+	  AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break])
+	done])
+      # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
+      if test "$am_cv_pathless_PYTHON" = none; then
+	PYTHON=:
       else
-       case $host_os in
-	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	   ;;
-	 *)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	   ;;
-       esac
+        AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON])
       fi
-      ;;
+      am_display_PYTHON=$am_cv_pathless_PYTHON
+    fi
+  ])
 
-    os2*)
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
+  if test "$PYTHON" = :; then
+  dnl Run any user-specified action, or abort.
+    m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
+  else
 
-    osf3*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
+  dnl Query Python for its version number.  Getting [:3] seems to be
+  dnl the best way to do this; it's what "site.py" does in the standard
+  dnl library.
 
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      else
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+  AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
+    [am_cv_python_version=`$PYTHON -c "import sys; print sys.version[[:3]]"`])
+  AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
 
-	# Both c and cxx compiler support -rpath directly
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
+  dnl Use the values of $prefix and $exec_prefix for the corresponding
+  dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX.  These are made
+  dnl distinct variables so they can be overridden if need be.  However,
+  dnl general consensus is that you shouldn't need this ability.
 
-    solaris*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	wlarc=''
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      case $host_os in
-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
-      esac
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
+  AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
+  AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
 
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
+  dnl At times (like when building shared libraries) you may want
+  dnl to know which OS platform Python thinks this is.
 
-    sysv4)
-      case $host_vendor in
-	sni)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-        ;;
-	motorola)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
+  AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],
+    [am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`])
+  AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
 
-    sysv4.3*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-      ;;
 
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-      fi
-      ;;
+  dnl Set up 4 directories:
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
+  dnl pythondir -- where to install python scripts.  This is the
+  dnl   site-packages directory, not the python standard library
+  dnl   directory like in previous automake betas.  This behavior
+  dnl   is more consistent with lispdir.m4 for example.
+  dnl Query distutils for this directory.  distutils does not exist in
+  dnl Python 1.5, so we fall back to the hardcoded directory if it
+  dnl doesn't work.
+  AC_CACHE_CHECK([for $am_display_PYTHON script directory],
+    [am_cv_python_pythondir],
+    [am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
+     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`])
+  AC_SUBST([pythondir], [$am_cv_python_pythondir])
 
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
+  dnl pkgpythondir -- $PACKAGE directory under pythondir.  Was
+  dnl   PYTHON_SITE_PACKAGE in previous betas, but this naming is
+  dnl   more consistent with the rest of automake.
 
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
+  AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE])
 
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
+  dnl pyexecdir -- directory for installing python extension modules
+  dnl   (shared libraries)
+  dnl Query distutils for this directory.  distutils does not exist in
+  dnl Python 1.5, so we fall back to the hardcoded directory if it
+  dnl doesn't work.
+  AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
+    [am_cv_python_pyexecdir],
+    [am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
+     echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`])
+  AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
 
-    uts4*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
+  dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
 
-    *)
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    esac
+  AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE])
+
+  dnl Run any user-specified action.
+  $2
   fi
+
 ])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
 
+
+# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
+# ---------------------------------------------------------------------------
+# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION.
+# Run ACTION-IF-FALSE otherwise.
+# This test uses sys.hexversion instead of the string equivalent (first
+# word of sys.version), in order to cope with versions such as 2.2c1.
+# hexversion has been introduced in Python 1.5.2; it's probably not
+# worth to support older versions (1.5.1 was released on October 31, 1998).
+AC_DEFUN([AM_PYTHON_CHECK_VERSION],
+ [prog="import sys, string
+# split strings by '.' and convert to numeric.  Append some zeros
+# because we need at least 4 digits for the hex conversion.
+minver = map(int, string.split('$2', '.')) + [[0, 0, 0]]
+minverhex = 0
+for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[[i]]
+sys.exit(sys.hexversion < minverhex)"
+  AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
 #
-# Do we need to explicitly link libc?
-#
-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
-  # Assume -lc should be added
-  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $_LT_AC_TAGVAR(archive_cmds, $1) in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-      $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+# serial 4
 
-      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
-        then
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-        else
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-        fi
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
-      ;;
-    esac
-  fi
-  ;;
-esac
-])# AC_LIBTOOL_PROG_LD_SHLIBS
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   if test "$[*]" = "X"; then
+      # -L didn't work.
+      set X `ls -t $srcdir/configure conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
 
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
 
-# _LT_AC_FILE_LTDLL_C
-# -------------------
-# Be careful that the start marker always follows a newline.
-AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
-# /* ltdll.c starts here */
-# #define WIN32_LEAN_AND_MEAN
-# #include <windows.h>
-# #undef WIN32_LEAN_AND_MEAN
-# #include <stdio.h>
-#
-# #ifndef __CYGWIN__
-# #  ifdef __CYGWIN32__
-# #    define __CYGWIN__ __CYGWIN32__
-# #  endif
-# #endif
-#
-# #ifdef __cplusplus
-# extern "C" {
-# #endif
-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-# #ifdef __cplusplus
-# }
-# #endif
-#
-# #ifdef __CYGWIN__
-# #include <cygwin/cygwin_dll.h>
-# DECLARE_CYGWIN_DLL( DllMain );
-# #endif
-# HINSTANCE __hDllInstance_base;
-#
-# BOOL APIENTRY
-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-# {
-#   __hDllInstance_base = hInst;
-#   return TRUE;
-# }
-# /* ltdll.c ends here */
-])# _LT_AC_FILE_LTDLL_C
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT(yes)])
 
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
-# ---------------------------------
-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor `install' (even GNU) is that you can't
+# specify the program used to strip binaries.  This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
+# Copyright (C) 2006  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
 
-# This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])
+# Check how to create a tarball.                            -*- Autoconf -*-
 
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-AC_DEFUN([LT_AC_PROG_RC],
-[AC_CHECK_TOOL(RC, windres, no)
-])
+# serial 2
 
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-# LT_AC_PROG_SED
-# --------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-AC_DEFUN([LT_AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of `v7', `ustar', or `pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+#     tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+#     $(am__untar) < result.tar
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [m4_case([$1], [ustar],, [pax],,
+              [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
+  case $_am_tool in
+  gnutar)
+    for _am_tar in tar gnutar gtar;
+    do
+      AM_RUN_LOG([$_am_tar --version]) && break
     done
-  done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+    am__untar="$_am_tar -xf -"
+    ;;
+  plaintar)
+    # Must skip GNU tar: if it does not support --format= it doesn't create
+    # ustar tarball either.
+    (tar --version) >/dev/null 2>&1 && continue
+    am__tar='tar chf - "$$tardir"'
+    am__tar_='tar chf - "$tardir"'
+    am__untar='tar xf -'
+    ;;
+  pax)
+    am__tar='pax -L -x $1 -w "$$tardir"'
+    am__tar_='pax -L -x $1 -w "$tardir"'
+    am__untar='pax -r'
+    ;;
+  cpio)
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+    am__untar='cpio -i -H $1 -d'
+    ;;
+  none)
+    am__tar=false
+    am__tar_=false
+    am__untar=false
+    ;;
+  esac
+
+  # If the value was cached, stop now.  We just wanted to have am__tar
+  # and am__untar set.
+  test -n "${am_cv_prog_tar_$1}" && break
+
+  # tar/untar a dummy directory, and stop if the command works
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  echo GrepMe > conftest.dir/file
+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  rm -rf conftest.dir
+  if test -s conftest.tar; then
+    AM_RUN_LOG([$am__untar <conftest.tar])
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
   fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
 done
-])
-SED=$lt_cv_path_SED
-AC_SUBST([SED])
-AC_MSG_RESULT([$SED])
-])
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
 
+m4_include([acinclude.m4])
--- a/cim/Makefile.in
+++ b/cim/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -34,16 +34,13 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -55,39 +52,244 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+noinst_PROGRAMS = simpletest$(EXEEXT)
+subdir = cim
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(cimprovidersdir)"
+cimprovidersLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(cimproviders_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+am__DEPENDENCIES_2 = $(top_builddir)/lib/clplumbing/libplumb.la \
+	$(top_builddir)/lib/hbclient/libhbclient.la \
+	$(top_builddir)/membership/ccm/libccmclient.la \
+	$(top_builddir)/membership/ccm/libclm.la $(am__DEPENDENCIES_1)
+libHAClusterInfo_la_DEPENDENCIES = $(am__DEPENDENCIES_2) $(MGMTLIBS)
+am_libHAClusterInfo_la_OBJECTS = mgmt_client.lo utils.lo \
+	cluster_info.lo cmpi_utils.lo mof_map.lo
+libHAClusterInfo_la_OBJECTS = $(am_libHAClusterInfo_la_OBJECTS)
+libHA_AttributesOfResourceProvider_la_DEPENDENCIES =  \
+	libHAClusterInfo.la
+am_libHA_AttributesOfResourceProvider_la_OBJECTS =  \
+	attrs_of_resource_provider.lo
+libHA_AttributesOfResourceProvider_la_OBJECTS =  \
+	$(am_libHA_AttributesOfResourceProvider_la_OBJECTS)
+libHA_ClusterNodeProvider_la_DEPENDENCIES = libHAClusterInfo.la
+am_libHA_ClusterNodeProvider_la_OBJECTS = cluster_node_provider.lo
+libHA_ClusterNodeProvider_la_OBJECTS =  \
+	$(am_libHA_ClusterNodeProvider_la_OBJECTS)
+libHA_ClusterProvider_la_DEPENDENCIES = libHAClusterInfo.la
+am_libHA_ClusterProvider_la_OBJECTS = cluster_provider.lo
+libHA_ClusterProvider_la_OBJECTS =  \
+	$(am_libHA_ClusterProvider_la_OBJECTS)
+libHA_ClusteringServiceProvider_la_DEPENDENCIES = libHAClusterInfo.la
+am_libHA_ClusteringServiceProvider_la_OBJECTS =  \
+	clustering_service_provider.lo
+libHA_ClusteringServiceProvider_la_OBJECTS =  \
+	$(am_libHA_ClusteringServiceProvider_la_OBJECTS)
+libHA_ColocationConstraintProvider_la_DEPENDENCIES =  \
+	libHAClusterInfo.la
+am_libHA_ColocationConstraintProvider_la_OBJECTS =  \
+	constraint_common.lo colocation_constraint_provider.lo
+libHA_ColocationConstraintProvider_la_OBJECTS =  \
+	$(am_libHA_ColocationConstraintProvider_la_OBJECTS)
+libHA_HostedResourceProvider_la_DEPENDENCIES = libHAClusterInfo.la
+am_libHA_HostedResourceProvider_la_OBJECTS =  \
+	hosted_resource_provider.lo
+libHA_HostedResourceProvider_la_OBJECTS =  \
+	$(am_libHA_HostedResourceProvider_la_OBJECTS)
+libHA_IndicationProvider_la_DEPENDENCIES = libHAClusterInfo.la
+am_libHA_IndicationProvider_la_OBJECTS =  \
+	cluster_indication_provider.lo
+libHA_IndicationProvider_la_OBJECTS =  \
+	$(am_libHA_IndicationProvider_la_OBJECTS)
+libHA_InstalledSoftwareIdentityProvider_la_DEPENDENCIES =  \
+	libHAClusterInfo.la
+am_libHA_InstalledSoftwareIdentityProvider_la_OBJECTS =  \
+	installed_software_provider.lo
+libHA_InstalledSoftwareIdentityProvider_la_OBJECTS =  \
+	$(am_libHA_InstalledSoftwareIdentityProvider_la_OBJECTS)
+libHA_InstanceAttributesProvider_la_DEPENDENCIES =  \
+	libHAClusterInfo.la
+am_libHA_InstanceAttributesProvider_la_OBJECTS =  \
+	instance_attrs_provider.lo
+libHA_InstanceAttributesProvider_la_OBJECTS =  \
+	$(am_libHA_InstanceAttributesProvider_la_OBJECTS)
+libHA_LocationConstraintProvider_la_DEPENDENCIES =  \
+	libHAClusterInfo.la
+am_libHA_LocationConstraintProvider_la_OBJECTS = constraint_common.lo \
+	location_constraint_provider.lo
+libHA_LocationConstraintProvider_la_OBJECTS =  \
+	$(am_libHA_LocationConstraintProvider_la_OBJECTS)
+libHA_LocationConstraintRuleProvider_la_DEPENDENCIES =  \
+	libHAClusterInfo.la
+am_libHA_LocationConstraintRuleProvider_la_OBJECTS =  \
+	constraint_common.lo constraint_rule_provider.lo
+libHA_LocationConstraintRuleProvider_la_OBJECTS =  \
+	$(am_libHA_LocationConstraintRuleProvider_la_OBJECTS)
+libHA_MasterSlaveResourceProvider_la_DEPENDENCIES =  \
+	libHAClusterInfo.la
+am_libHA_MasterSlaveResourceProvider_la_OBJECTS = resource_common.lo \
+	masterslave_resource_provider.lo
+libHA_MasterSlaveResourceProvider_la_OBJECTS =  \
+	$(am_libHA_MasterSlaveResourceProvider_la_OBJECTS)
+libHA_OperationOnProvider_la_DEPENDENCIES = libHAClusterInfo.la
+am_libHA_OperationOnProvider_la_OBJECTS = operation_on_provider.lo
+libHA_OperationOnProvider_la_OBJECTS =  \
+	$(am_libHA_OperationOnProvider_la_OBJECTS)
+libHA_OperationProvider_la_DEPENDENCIES = libHAClusterInfo.la
+am_libHA_OperationProvider_la_OBJECTS = operation_provider.lo
+libHA_OperationProvider_la_OBJECTS =  \
+	$(am_libHA_OperationProvider_la_OBJECTS)
+libHA_OrderConstraintProvider_la_DEPENDENCIES = libHAClusterInfo.la
+am_libHA_OrderConstraintProvider_la_OBJECTS = constraint_common.lo \
+	order_constraint_provider.lo
+libHA_OrderConstraintProvider_la_OBJECTS =  \
+	$(am_libHA_OrderConstraintProvider_la_OBJECTS)
+libHA_ParticipatingNodeProvider_la_DEPENDENCIES = libHAClusterInfo.la
+am_libHA_ParticipatingNodeProvider_la_OBJECTS =  \
+	participating_node_provider.lo
+libHA_ParticipatingNodeProvider_la_OBJECTS =  \
+	$(am_libHA_ParticipatingNodeProvider_la_OBJECTS)
+libHA_PrimitiveResourceProvider_la_DEPENDENCIES = libHAClusterInfo.la
+am_libHA_PrimitiveResourceProvider_la_OBJECTS = resource_common.lo \
+	primitive_resource_provider.lo
+libHA_PrimitiveResourceProvider_la_OBJECTS =  \
+	$(am_libHA_PrimitiveResourceProvider_la_OBJECTS)
+libHA_ResourceCloneProvider_la_DEPENDENCIES = libHAClusterInfo.la
+am_libHA_ResourceCloneProvider_la_OBJECTS = resource_common.lo \
+	resource_clone_provider.lo
+libHA_ResourceCloneProvider_la_OBJECTS =  \
+	$(am_libHA_ResourceCloneProvider_la_OBJECTS)
+libHA_ResourceGroupProvider_la_DEPENDENCIES = libHAClusterInfo.la
+am_libHA_ResourceGroupProvider_la_OBJECTS = resource_common.lo \
+	resource_group_provider.lo
+libHA_ResourceGroupProvider_la_OBJECTS =  \
+	$(am_libHA_ResourceGroupProvider_la_OBJECTS)
+libHA_RuleOfLocationConstraintProvider_la_DEPENDENCIES =  \
+	libHAClusterInfo.la
+am_libHA_RuleOfLocationConstraintProvider_la_OBJECTS =  \
+	rule_of_constraint_provider.lo
+libHA_RuleOfLocationConstraintProvider_la_OBJECTS =  \
+	$(am_libHA_RuleOfLocationConstraintProvider_la_OBJECTS)
+libHA_SoftwareIdentityProvider_la_DEPENDENCIES = libHAClusterInfo.la
+am_libHA_SoftwareIdentityProvider_la_OBJECTS =  \
+	software_identity_provider.lo
+libHA_SoftwareIdentityProvider_la_OBJECTS =  \
+	$(am_libHA_SoftwareIdentityProvider_la_OBJECTS)
+libHA_SubResourceProvider_la_DEPENDENCIES = libHAClusterInfo.la
+am_libHA_SubResourceProvider_la_OBJECTS = subresource_provider.lo
+libHA_SubResourceProvider_la_OBJECTS =  \
+	$(am_libHA_SubResourceProvider_la_OBJECTS)
+PROGRAMS = $(noinst_PROGRAMS)
+am_simpletest_OBJECTS = simple_test.$(OBJEXT)
+simpletest_OBJECTS = $(am_simpletest_OBJECTS)
+simpletest_DEPENDENCIES = libHAClusterInfo.la
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libHAClusterInfo_la_SOURCES) \
+	$(libHA_AttributesOfResourceProvider_la_SOURCES) \
+	$(libHA_ClusterNodeProvider_la_SOURCES) \
+	$(libHA_ClusterProvider_la_SOURCES) \
+	$(libHA_ClusteringServiceProvider_la_SOURCES) \
+	$(libHA_ColocationConstraintProvider_la_SOURCES) \
+	$(libHA_HostedResourceProvider_la_SOURCES) \
+	$(libHA_IndicationProvider_la_SOURCES) \
+	$(libHA_InstalledSoftwareIdentityProvider_la_SOURCES) \
+	$(libHA_InstanceAttributesProvider_la_SOURCES) \
+	$(libHA_LocationConstraintProvider_la_SOURCES) \
+	$(libHA_LocationConstraintRuleProvider_la_SOURCES) \
+	$(libHA_MasterSlaveResourceProvider_la_SOURCES) \
+	$(libHA_OperationOnProvider_la_SOURCES) \
+	$(libHA_OperationProvider_la_SOURCES) \
+	$(libHA_OrderConstraintProvider_la_SOURCES) \
+	$(libHA_ParticipatingNodeProvider_la_SOURCES) \
+	$(libHA_PrimitiveResourceProvider_la_SOURCES) \
+	$(libHA_ResourceCloneProvider_la_SOURCES) \
+	$(libHA_ResourceGroupProvider_la_SOURCES) \
+	$(libHA_RuleOfLocationConstraintProvider_la_SOURCES) \
+	$(libHA_SoftwareIdentityProvider_la_SOURCES) \
+	$(libHA_SubResourceProvider_la_SOURCES) $(simpletest_SOURCES)
+DIST_SOURCES = $(libHAClusterInfo_la_SOURCES) \
+	$(libHA_AttributesOfResourceProvider_la_SOURCES) \
+	$(libHA_ClusterNodeProvider_la_SOURCES) \
+	$(libHA_ClusterProvider_la_SOURCES) \
+	$(libHA_ClusteringServiceProvider_la_SOURCES) \
+	$(libHA_ColocationConstraintProvider_la_SOURCES) \
+	$(libHA_HostedResourceProvider_la_SOURCES) \
+	$(libHA_IndicationProvider_la_SOURCES) \
+	$(libHA_InstalledSoftwareIdentityProvider_la_SOURCES) \
+	$(libHA_InstanceAttributesProvider_la_SOURCES) \
+	$(libHA_LocationConstraintProvider_la_SOURCES) \
+	$(libHA_LocationConstraintRuleProvider_la_SOURCES) \
+	$(libHA_MasterSlaveResourceProvider_la_SOURCES) \
+	$(libHA_OperationOnProvider_la_SOURCES) \
+	$(libHA_OperationProvider_la_SOURCES) \
+	$(libHA_OrderConstraintProvider_la_SOURCES) \
+	$(libHA_ParticipatingNodeProvider_la_SOURCES) \
+	$(libHA_PrimitiveResourceProvider_la_SOURCES) \
+	$(libHA_ResourceCloneProvider_la_SOURCES) \
+	$(libHA_ResourceGroupProvider_la_SOURCES) \
+	$(libHA_RuleOfLocationConstraintProvider_la_SOURCES) \
+	$(libHA_SoftwareIdentityProvider_la_SOURCES) \
+	$(libHA_SubResourceProvider_la_SOURCES) $(simpletest_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+HEADERS = $(noinst_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -110,8 +312,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -155,8 +355,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -168,6 +366,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -175,12 +374,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -198,8 +393,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -208,15 +401,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -246,8 +436,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -268,8 +456,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -280,20 +466,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -301,17 +475,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -319,6 +495,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -340,6 +517,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -354,25 +532,25 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 MAINTAINERCLEANFILES = Makefile.in
 
 # Subdirectories
 SUBDIRS = mof
-
 CMPIHEADERS = $(CMPI_HEADER_PATH)
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include    \
                           -I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha  \
                           -I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl    \
                           -I$(CMPI_HEADER_PATH)
 
-
 COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la      \
                           $(top_builddir)/lib/hbclient/libhbclient.la     \
 			  $(top_builddir)/membership/ccm/libccmclient.la  \
@@ -383,19 +561,15 @@
 #using pthread, or gthread?
 #THREADLIB              = `pkg-config --libs gthread-2.0` 
 THREADLIB = lpthread
-
 cimprovidersdir = $(CMPI_PROVIDER_DIR)
-
 noinst_HEADERS = cluster_info.h cmpi_utils.h  mof_map.h\
                            resource_common.h constraint_common.h
 
-
 LRM_DIR = lrm
 MGMTLIBS = $(top_builddir)/mgmt/daemon/libhbmgmt.la     \
                            $(top_builddir)/lib/mgmt/libhbmgmtcommon.la  \
                            $(top_builddir)/lib/$(LRM_DIR)/liblrm.la
 
-
 cimproviders_LTLIBRARIES = libHAClusterInfo.la				\
 			   libHA_ClusterProvider.la			\
 			   libHA_ClusterNodeProvider.la      		\
@@ -492,324 +666,114 @@
 #--------------------------------------------------------------
 libHA_RuleOfLocationConstraintProvider_la_SOURCES = rule_of_constraint_provider.c
 libHA_RuleOfLocationConstraintProvider_la_LIBADD = libHAClusterInfo.la
-
-#--------------------------------------------------------------
-noinst_PROGRAMS = simpletest
 simpletest_SOURCES = simple_test.c
 simpletest_LDADD = libHAClusterInfo.la 
-subdir = cim
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(cimproviders_LTLIBRARIES)
-
-libHAClusterInfo_la_LDFLAGS =
-libHAClusterInfo_la_DEPENDENCIES = \
-	$(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/hbclient/libhbclient.la \
-	$(top_builddir)/membership/ccm/libccmclient.la \
-	$(top_builddir)/membership/ccm/libclm.la \
-	$(top_builddir)/mgmt/daemon/libhbmgmt.la \
-	$(top_builddir)/lib/mgmt/libhbmgmtcommon.la \
-	$(top_builddir)/lib/$(LRM_DIR)/liblrm.la
-am_libHAClusterInfo_la_OBJECTS = mgmt_client.lo utils.lo cluster_info.lo \
-	cmpi_utils.lo mof_map.lo
-libHAClusterInfo_la_OBJECTS = $(am_libHAClusterInfo_la_OBJECTS)
-libHA_AttributesOfResourceProvider_la_LDFLAGS =
-libHA_AttributesOfResourceProvider_la_DEPENDENCIES = libHAClusterInfo.la
-am_libHA_AttributesOfResourceProvider_la_OBJECTS = \
-	attrs_of_resource_provider.lo
-libHA_AttributesOfResourceProvider_la_OBJECTS = \
-	$(am_libHA_AttributesOfResourceProvider_la_OBJECTS)
-libHA_ClusterNodeProvider_la_LDFLAGS =
-libHA_ClusterNodeProvider_la_DEPENDENCIES = libHAClusterInfo.la
-am_libHA_ClusterNodeProvider_la_OBJECTS = cluster_node_provider.lo
-libHA_ClusterNodeProvider_la_OBJECTS = \
-	$(am_libHA_ClusterNodeProvider_la_OBJECTS)
-libHA_ClusterProvider_la_LDFLAGS =
-libHA_ClusterProvider_la_DEPENDENCIES = libHAClusterInfo.la
-am_libHA_ClusterProvider_la_OBJECTS = cluster_provider.lo
-libHA_ClusterProvider_la_OBJECTS = \
-	$(am_libHA_ClusterProvider_la_OBJECTS)
-libHA_ClusteringServiceProvider_la_LDFLAGS =
-libHA_ClusteringServiceProvider_la_DEPENDENCIES = libHAClusterInfo.la
-am_libHA_ClusteringServiceProvider_la_OBJECTS = \
-	clustering_service_provider.lo
-libHA_ClusteringServiceProvider_la_OBJECTS = \
-	$(am_libHA_ClusteringServiceProvider_la_OBJECTS)
-libHA_ColocationConstraintProvider_la_LDFLAGS =
-libHA_ColocationConstraintProvider_la_DEPENDENCIES = libHAClusterInfo.la
-am_libHA_ColocationConstraintProvider_la_OBJECTS = constraint_common.lo \
-	colocation_constraint_provider.lo
-libHA_ColocationConstraintProvider_la_OBJECTS = \
-	$(am_libHA_ColocationConstraintProvider_la_OBJECTS)
-libHA_HostedResourceProvider_la_LDFLAGS =
-libHA_HostedResourceProvider_la_DEPENDENCIES = libHAClusterInfo.la
-am_libHA_HostedResourceProvider_la_OBJECTS = hosted_resource_provider.lo
-libHA_HostedResourceProvider_la_OBJECTS = \
-	$(am_libHA_HostedResourceProvider_la_OBJECTS)
-libHA_IndicationProvider_la_LDFLAGS =
-libHA_IndicationProvider_la_DEPENDENCIES = libHAClusterInfo.la
-am_libHA_IndicationProvider_la_OBJECTS = cluster_indication_provider.lo
-libHA_IndicationProvider_la_OBJECTS = \
-	$(am_libHA_IndicationProvider_la_OBJECTS)
-libHA_InstalledSoftwareIdentityProvider_la_LDFLAGS =
-libHA_InstalledSoftwareIdentityProvider_la_DEPENDENCIES = \
-	libHAClusterInfo.la
-am_libHA_InstalledSoftwareIdentityProvider_la_OBJECTS = \
-	installed_software_provider.lo
-libHA_InstalledSoftwareIdentityProvider_la_OBJECTS = \
-	$(am_libHA_InstalledSoftwareIdentityProvider_la_OBJECTS)
-libHA_InstanceAttributesProvider_la_LDFLAGS =
-libHA_InstanceAttributesProvider_la_DEPENDENCIES = libHAClusterInfo.la
-am_libHA_InstanceAttributesProvider_la_OBJECTS = \
-	instance_attrs_provider.lo
-libHA_InstanceAttributesProvider_la_OBJECTS = \
-	$(am_libHA_InstanceAttributesProvider_la_OBJECTS)
-libHA_LocationConstraintProvider_la_LDFLAGS =
-libHA_LocationConstraintProvider_la_DEPENDENCIES = libHAClusterInfo.la
-am_libHA_LocationConstraintProvider_la_OBJECTS = constraint_common.lo \
-	location_constraint_provider.lo
-libHA_LocationConstraintProvider_la_OBJECTS = \
-	$(am_libHA_LocationConstraintProvider_la_OBJECTS)
-libHA_LocationConstraintRuleProvider_la_LDFLAGS =
-libHA_LocationConstraintRuleProvider_la_DEPENDENCIES = \
-	libHAClusterInfo.la
-am_libHA_LocationConstraintRuleProvider_la_OBJECTS = \
-	constraint_common.lo constraint_rule_provider.lo
-libHA_LocationConstraintRuleProvider_la_OBJECTS = \
-	$(am_libHA_LocationConstraintRuleProvider_la_OBJECTS)
-libHA_MasterSlaveResourceProvider_la_LDFLAGS =
-libHA_MasterSlaveResourceProvider_la_DEPENDENCIES = libHAClusterInfo.la
-am_libHA_MasterSlaveResourceProvider_la_OBJECTS = resource_common.lo \
-	masterslave_resource_provider.lo
-libHA_MasterSlaveResourceProvider_la_OBJECTS = \
-	$(am_libHA_MasterSlaveResourceProvider_la_OBJECTS)
-libHA_OperationOnProvider_la_LDFLAGS =
-libHA_OperationOnProvider_la_DEPENDENCIES = libHAClusterInfo.la
-am_libHA_OperationOnProvider_la_OBJECTS = operation_on_provider.lo
-libHA_OperationOnProvider_la_OBJECTS = \
-	$(am_libHA_OperationOnProvider_la_OBJECTS)
-libHA_OperationProvider_la_LDFLAGS =
-libHA_OperationProvider_la_DEPENDENCIES = libHAClusterInfo.la
-am_libHA_OperationProvider_la_OBJECTS = operation_provider.lo
-libHA_OperationProvider_la_OBJECTS = \
-	$(am_libHA_OperationProvider_la_OBJECTS)
-libHA_OrderConstraintProvider_la_LDFLAGS =
-libHA_OrderConstraintProvider_la_DEPENDENCIES = libHAClusterInfo.la
-am_libHA_OrderConstraintProvider_la_OBJECTS = constraint_common.lo \
-	order_constraint_provider.lo
-libHA_OrderConstraintProvider_la_OBJECTS = \
-	$(am_libHA_OrderConstraintProvider_la_OBJECTS)
-libHA_ParticipatingNodeProvider_la_LDFLAGS =
-libHA_ParticipatingNodeProvider_la_DEPENDENCIES = libHAClusterInfo.la
-am_libHA_ParticipatingNodeProvider_la_OBJECTS = \
-	participating_node_provider.lo
-libHA_ParticipatingNodeProvider_la_OBJECTS = \
-	$(am_libHA_ParticipatingNodeProvider_la_OBJECTS)
-libHA_PrimitiveResourceProvider_la_LDFLAGS =
-libHA_PrimitiveResourceProvider_la_DEPENDENCIES = libHAClusterInfo.la
-am_libHA_PrimitiveResourceProvider_la_OBJECTS = resource_common.lo \
-	primitive_resource_provider.lo
-libHA_PrimitiveResourceProvider_la_OBJECTS = \
-	$(am_libHA_PrimitiveResourceProvider_la_OBJECTS)
-libHA_ResourceCloneProvider_la_LDFLAGS =
-libHA_ResourceCloneProvider_la_DEPENDENCIES = libHAClusterInfo.la
-am_libHA_ResourceCloneProvider_la_OBJECTS = resource_common.lo \
-	resource_clone_provider.lo
-libHA_ResourceCloneProvider_la_OBJECTS = \
-	$(am_libHA_ResourceCloneProvider_la_OBJECTS)
-libHA_ResourceGroupProvider_la_LDFLAGS =
-libHA_ResourceGroupProvider_la_DEPENDENCIES = libHAClusterInfo.la
-am_libHA_ResourceGroupProvider_la_OBJECTS = resource_common.lo \
-	resource_group_provider.lo
-libHA_ResourceGroupProvider_la_OBJECTS = \
-	$(am_libHA_ResourceGroupProvider_la_OBJECTS)
-libHA_RuleOfLocationConstraintProvider_la_LDFLAGS =
-libHA_RuleOfLocationConstraintProvider_la_DEPENDENCIES = \
-	libHAClusterInfo.la
-am_libHA_RuleOfLocationConstraintProvider_la_OBJECTS = \
-	rule_of_constraint_provider.lo
-libHA_RuleOfLocationConstraintProvider_la_OBJECTS = \
-	$(am_libHA_RuleOfLocationConstraintProvider_la_OBJECTS)
-libHA_SoftwareIdentityProvider_la_LDFLAGS =
-libHA_SoftwareIdentityProvider_la_DEPENDENCIES = libHAClusterInfo.la
-am_libHA_SoftwareIdentityProvider_la_OBJECTS = \
-	software_identity_provider.lo
-libHA_SoftwareIdentityProvider_la_OBJECTS = \
-	$(am_libHA_SoftwareIdentityProvider_la_OBJECTS)
-libHA_SubResourceProvider_la_LDFLAGS =
-libHA_SubResourceProvider_la_DEPENDENCIES = libHAClusterInfo.la
-am_libHA_SubResourceProvider_la_OBJECTS = subresource_provider.lo
-libHA_SubResourceProvider_la_OBJECTS = \
-	$(am_libHA_SubResourceProvider_la_OBJECTS)
-noinst_PROGRAMS = simpletest$(EXEEXT)
-PROGRAMS = $(noinst_PROGRAMS)
-
-am_simpletest_OBJECTS = simple_test.$(OBJEXT)
-simpletest_OBJECTS = $(am_simpletest_OBJECTS)
-simpletest_DEPENDENCIES = libHAClusterInfo.la
-simpletest_LDFLAGS =
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/attrs_of_resource_provider.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/cluster_indication_provider.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/cluster_info.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/cluster_node_provider.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/cluster_provider.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/clustering_service_provider.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/cmpi_utils.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/colocation_constraint_provider.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/constraint_common.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/constraint_rule_provider.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/hosted_resource_provider.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/installed_software_provider.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/instance_attrs_provider.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/location_constraint_provider.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/masterslave_resource_provider.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/mgmt_client.Plo ./$(DEPDIR)/mof_map.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/operation_on_provider.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/operation_provider.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/order_constraint_provider.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/participating_node_provider.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/primitive_resource_provider.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/resource_clone_provider.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/resource_common.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/resource_group_provider.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/rule_of_constraint_provider.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/simple_test.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/software_identity_provider.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/subresource_provider.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/utils.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libHAClusterInfo_la_SOURCES) \
-	$(libHA_AttributesOfResourceProvider_la_SOURCES) \
-	$(libHA_ClusterNodeProvider_la_SOURCES) \
-	$(libHA_ClusterProvider_la_SOURCES) \
-	$(libHA_ClusteringServiceProvider_la_SOURCES) \
-	$(libHA_ColocationConstraintProvider_la_SOURCES) \
-	$(libHA_HostedResourceProvider_la_SOURCES) \
-	$(libHA_IndicationProvider_la_SOURCES) \
-	$(libHA_InstalledSoftwareIdentityProvider_la_SOURCES) \
-	$(libHA_InstanceAttributesProvider_la_SOURCES) \
-	$(libHA_LocationConstraintProvider_la_SOURCES) \
-	$(libHA_LocationConstraintRuleProvider_la_SOURCES) \
-	$(libHA_MasterSlaveResourceProvider_la_SOURCES) \
-	$(libHA_OperationOnProvider_la_SOURCES) \
-	$(libHA_OperationProvider_la_SOURCES) \
-	$(libHA_OrderConstraintProvider_la_SOURCES) \
-	$(libHA_ParticipatingNodeProvider_la_SOURCES) \
-	$(libHA_PrimitiveResourceProvider_la_SOURCES) \
-	$(libHA_ResourceCloneProvider_la_SOURCES) \
-	$(libHA_ResourceGroupProvider_la_SOURCES) \
-	$(libHA_RuleOfLocationConstraintProvider_la_SOURCES) \
-	$(libHA_SoftwareIdentityProvider_la_SOURCES) \
-	$(libHA_SubResourceProvider_la_SOURCES) $(simpletest_SOURCES)
-HEADERS = $(noinst_HEADERS)
-
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am
-DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(libHAClusterInfo_la_SOURCES) $(libHA_AttributesOfResourceProvider_la_SOURCES) $(libHA_ClusterNodeProvider_la_SOURCES) $(libHA_ClusterProvider_la_SOURCES) $(libHA_ClusteringServiceProvider_la_SOURCES) $(libHA_ColocationConstraintProvider_la_SOURCES) $(libHA_HostedResourceProvider_la_SOURCES) $(libHA_IndicationProvider_la_SOURCES) $(libHA_InstalledSoftwareIdentityProvider_la_SOURCES) $(libHA_InstanceAttributesProvider_la_SOURCES) $(libHA_LocationConstraintProvider_la_SOURCES) $(libHA_LocationConstraintRuleProvider_la_SOURCES) $(libHA_MasterSlaveResourceProvider_la_SOURCES) $(libHA_OperationOnProvider_la_SOURCES) $(libHA_OperationProvider_la_SOURCES) $(libHA_OrderConstraintProvider_la_SOURCES) $(libHA_ParticipatingNodeProvider_la_SOURCES) $(libHA_PrimitiveResourceProvider_la_SOURCES) $(libHA_ResourceCloneProvider_la_SOURCES) $(libHA_ResourceGroupProvider_la_SOURCES) $(libHA_RuleOfLocationConstraintProvider_la_SOURCES) $(libHA_SoftwareIdentityProvider_la_SOURCES) $(libHA_SubResourceProvider_la_SOURCES) $(simpletest_SOURCES)
-
 all: all-recursive
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  cim/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  cim/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-cimprovidersLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-cimprovidersLTLIBRARIES: $(cimproviders_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(cimprovidersdir)
+	test -z "$(cimprovidersdir)" || $(MKDIR_P) "$(DESTDIR)$(cimprovidersdir)"
 	@list='$(cimproviders_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(cimprovidersLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(cimprovidersdir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(cimprovidersLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(cimprovidersdir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(cimprovidersLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(cimprovidersdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(cimprovidersLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(cimprovidersdir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-cimprovidersLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(cimproviders_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(cimprovidersdir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(cimprovidersdir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(cimprovidersdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(cimprovidersdir)/$$p"; \
 	done
 
 clean-cimprovidersLTLIBRARIES:
 	-test -z "$(cimproviders_LTLIBRARIES)" || rm -f $(cimproviders_LTLIBRARIES)
 	@list='$(cimproviders_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libHAClusterInfo.la: $(libHAClusterInfo_la_OBJECTS) $(libHAClusterInfo_la_DEPENDENCIES) 
-	$(LINK) -rpath $(cimprovidersdir) $(libHAClusterInfo_la_LDFLAGS) $(libHAClusterInfo_la_OBJECTS) $(libHAClusterInfo_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(cimprovidersdir) $(libHAClusterInfo_la_OBJECTS) $(libHAClusterInfo_la_LIBADD) $(LIBS)
 libHA_AttributesOfResourceProvider.la: $(libHA_AttributesOfResourceProvider_la_OBJECTS) $(libHA_AttributesOfResourceProvider_la_DEPENDENCIES) 
-	$(LINK) -rpath $(cimprovidersdir) $(libHA_AttributesOfResourceProvider_la_LDFLAGS) $(libHA_AttributesOfResourceProvider_la_OBJECTS) $(libHA_AttributesOfResourceProvider_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(cimprovidersdir) $(libHA_AttributesOfResourceProvider_la_OBJECTS) $(libHA_AttributesOfResourceProvider_la_LIBADD) $(LIBS)
 libHA_ClusterNodeProvider.la: $(libHA_ClusterNodeProvider_la_OBJECTS) $(libHA_ClusterNodeProvider_la_DEPENDENCIES) 
-	$(LINK) -rpath $(cimprovidersdir) $(libHA_ClusterNodeProvider_la_LDFLAGS) $(libHA_ClusterNodeProvider_la_OBJECTS) $(libHA_ClusterNodeProvider_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(cimprovidersdir) $(libHA_ClusterNodeProvider_la_OBJECTS) $(libHA_ClusterNodeProvider_la_LIBADD) $(LIBS)
 libHA_ClusterProvider.la: $(libHA_ClusterProvider_la_OBJECTS) $(libHA_ClusterProvider_la_DEPENDENCIES) 
-	$(LINK) -rpath $(cimprovidersdir) $(libHA_ClusterProvider_la_LDFLAGS) $(libHA_ClusterProvider_la_OBJECTS) $(libHA_ClusterProvider_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(cimprovidersdir) $(libHA_ClusterProvider_la_OBJECTS) $(libHA_ClusterProvider_la_LIBADD) $(LIBS)
 libHA_ClusteringServiceProvider.la: $(libHA_ClusteringServiceProvider_la_OBJECTS) $(libHA_ClusteringServiceProvider_la_DEPENDENCIES) 
-	$(LINK) -rpath $(cimprovidersdir) $(libHA_ClusteringServiceProvider_la_LDFLAGS) $(libHA_ClusteringServiceProvider_la_OBJECTS) $(libHA_ClusteringServiceProvider_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(cimprovidersdir) $(libHA_ClusteringServiceProvider_la_OBJECTS) $(libHA_ClusteringServiceProvider_la_LIBADD) $(LIBS)
 libHA_ColocationConstraintProvider.la: $(libHA_ColocationConstraintProvider_la_OBJECTS) $(libHA_ColocationConstraintProvider_la_DEPENDENCIES) 
-	$(LINK) -rpath $(cimprovidersdir) $(libHA_ColocationConstraintProvider_la_LDFLAGS) $(libHA_ColocationConstraintProvider_la_OBJECTS) $(libHA_ColocationConstraintProvider_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(cimprovidersdir) $(libHA_ColocationConstraintProvider_la_OBJECTS) $(libHA_ColocationConstraintProvider_la_LIBADD) $(LIBS)
 libHA_HostedResourceProvider.la: $(libHA_HostedResourceProvider_la_OBJECTS) $(libHA_HostedResourceProvider_la_DEPENDENCIES) 
-	$(LINK) -rpath $(cimprovidersdir) $(libHA_HostedResourceProvider_la_LDFLAGS) $(libHA_HostedResourceProvider_la_OBJECTS) $(libHA_HostedResourceProvider_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(cimprovidersdir) $(libHA_HostedResourceProvider_la_OBJECTS) $(libHA_HostedResourceProvider_la_LIBADD) $(LIBS)
 libHA_IndicationProvider.la: $(libHA_IndicationProvider_la_OBJECTS) $(libHA_IndicationProvider_la_DEPENDENCIES) 
-	$(LINK) -rpath $(cimprovidersdir) $(libHA_IndicationProvider_la_LDFLAGS) $(libHA_IndicationProvider_la_OBJECTS) $(libHA_IndicationProvider_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(cimprovidersdir) $(libHA_IndicationProvider_la_OBJECTS) $(libHA_IndicationProvider_la_LIBADD) $(LIBS)
 libHA_InstalledSoftwareIdentityProvider.la: $(libHA_InstalledSoftwareIdentityProvider_la_OBJECTS) $(libHA_InstalledSoftwareIdentityProvider_la_DEPENDENCIES) 
-	$(LINK) -rpath $(cimprovidersdir) $(libHA_InstalledSoftwareIdentityProvider_la_LDFLAGS) $(libHA_InstalledSoftwareIdentityProvider_la_OBJECTS) $(libHA_InstalledSoftwareIdentityProvider_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(cimprovidersdir) $(libHA_InstalledSoftwareIdentityProvider_la_OBJECTS) $(libHA_InstalledSoftwareIdentityProvider_la_LIBADD) $(LIBS)
 libHA_InstanceAttributesProvider.la: $(libHA_InstanceAttributesProvider_la_OBJECTS) $(libHA_InstanceAttributesProvider_la_DEPENDENCIES) 
-	$(LINK) -rpath $(cimprovidersdir) $(libHA_InstanceAttributesProvider_la_LDFLAGS) $(libHA_InstanceAttributesProvider_la_OBJECTS) $(libHA_InstanceAttributesProvider_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(cimprovidersdir) $(libHA_InstanceAttributesProvider_la_OBJECTS) $(libHA_InstanceAttributesProvider_la_LIBADD) $(LIBS)
 libHA_LocationConstraintProvider.la: $(libHA_LocationConstraintProvider_la_OBJECTS) $(libHA_LocationConstraintProvider_la_DEPENDENCIES) 
-	$(LINK) -rpath $(cimprovidersdir) $(libHA_LocationConstraintProvider_la_LDFLAGS) $(libHA_LocationConstraintProvider_la_OBJECTS) $(libHA_LocationConstraintProvider_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(cimprovidersdir) $(libHA_LocationConstraintProvider_la_OBJECTS) $(libHA_LocationConstraintProvider_la_LIBADD) $(LIBS)
 libHA_LocationConstraintRuleProvider.la: $(libHA_LocationConstraintRuleProvider_la_OBJECTS) $(libHA_LocationConstraintRuleProvider_la_DEPENDENCIES) 
-	$(LINK) -rpath $(cimprovidersdir) $(libHA_LocationConstraintRuleProvider_la_LDFLAGS) $(libHA_LocationConstraintRuleProvider_la_OBJECTS) $(libHA_LocationConstraintRuleProvider_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(cimprovidersdir) $(libHA_LocationConstraintRuleProvider_la_OBJECTS) $(libHA_LocationConstraintRuleProvider_la_LIBADD) $(LIBS)
 libHA_MasterSlaveResourceProvider.la: $(libHA_MasterSlaveResourceProvider_la_OBJECTS) $(libHA_MasterSlaveResourceProvider_la_DEPENDENCIES) 
-	$(LINK) -rpath $(cimprovidersdir) $(libHA_MasterSlaveResourceProvider_la_LDFLAGS) $(libHA_MasterSlaveResourceProvider_la_OBJECTS) $(libHA_MasterSlaveResourceProvider_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(cimprovidersdir) $(libHA_MasterSlaveResourceProvider_la_OBJECTS) $(libHA_MasterSlaveResourceProvider_la_LIBADD) $(LIBS)
 libHA_OperationOnProvider.la: $(libHA_OperationOnProvider_la_OBJECTS) $(libHA_OperationOnProvider_la_DEPENDENCIES) 
-	$(LINK) -rpath $(cimprovidersdir) $(libHA_OperationOnProvider_la_LDFLAGS) $(libHA_OperationOnProvider_la_OBJECTS) $(libHA_OperationOnProvider_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(cimprovidersdir) $(libHA_OperationOnProvider_la_OBJECTS) $(libHA_OperationOnProvider_la_LIBADD) $(LIBS)
 libHA_OperationProvider.la: $(libHA_OperationProvider_la_OBJECTS) $(libHA_OperationProvider_la_DEPENDENCIES) 
-	$(LINK) -rpath $(cimprovidersdir) $(libHA_OperationProvider_la_LDFLAGS) $(libHA_OperationProvider_la_OBJECTS) $(libHA_OperationProvider_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(cimprovidersdir) $(libHA_OperationProvider_la_OBJECTS) $(libHA_OperationProvider_la_LIBADD) $(LIBS)
 libHA_OrderConstraintProvider.la: $(libHA_OrderConstraintProvider_la_OBJECTS) $(libHA_OrderConstraintProvider_la_DEPENDENCIES) 
-	$(LINK) -rpath $(cimprovidersdir) $(libHA_OrderConstraintProvider_la_LDFLAGS) $(libHA_OrderConstraintProvider_la_OBJECTS) $(libHA_OrderConstraintProvider_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(cimprovidersdir) $(libHA_OrderConstraintProvider_la_OBJECTS) $(libHA_OrderConstraintProvider_la_LIBADD) $(LIBS)
 libHA_ParticipatingNodeProvider.la: $(libHA_ParticipatingNodeProvider_la_OBJECTS) $(libHA_ParticipatingNodeProvider_la_DEPENDENCIES) 
-	$(LINK) -rpath $(cimprovidersdir) $(libHA_ParticipatingNodeProvider_la_LDFLAGS) $(libHA_ParticipatingNodeProvider_la_OBJECTS) $(libHA_ParticipatingNodeProvider_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(cimprovidersdir) $(libHA_ParticipatingNodeProvider_la_OBJECTS) $(libHA_ParticipatingNodeProvider_la_LIBADD) $(LIBS)
 libHA_PrimitiveResourceProvider.la: $(libHA_PrimitiveResourceProvider_la_OBJECTS) $(libHA_PrimitiveResourceProvider_la_DEPENDENCIES) 
-	$(LINK) -rpath $(cimprovidersdir) $(libHA_PrimitiveResourceProvider_la_LDFLAGS) $(libHA_PrimitiveResourceProvider_la_OBJECTS) $(libHA_PrimitiveResourceProvider_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(cimprovidersdir) $(libHA_PrimitiveResourceProvider_la_OBJECTS) $(libHA_PrimitiveResourceProvider_la_LIBADD) $(LIBS)
 libHA_ResourceCloneProvider.la: $(libHA_ResourceCloneProvider_la_OBJECTS) $(libHA_ResourceCloneProvider_la_DEPENDENCIES) 
-	$(LINK) -rpath $(cimprovidersdir) $(libHA_ResourceCloneProvider_la_LDFLAGS) $(libHA_ResourceCloneProvider_la_OBJECTS) $(libHA_ResourceCloneProvider_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(cimprovidersdir) $(libHA_ResourceCloneProvider_la_OBJECTS) $(libHA_ResourceCloneProvider_la_LIBADD) $(LIBS)
 libHA_ResourceGroupProvider.la: $(libHA_ResourceGroupProvider_la_OBJECTS) $(libHA_ResourceGroupProvider_la_DEPENDENCIES) 
-	$(LINK) -rpath $(cimprovidersdir) $(libHA_ResourceGroupProvider_la_LDFLAGS) $(libHA_ResourceGroupProvider_la_OBJECTS) $(libHA_ResourceGroupProvider_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(cimprovidersdir) $(libHA_ResourceGroupProvider_la_OBJECTS) $(libHA_ResourceGroupProvider_la_LIBADD) $(LIBS)
 libHA_RuleOfLocationConstraintProvider.la: $(libHA_RuleOfLocationConstraintProvider_la_OBJECTS) $(libHA_RuleOfLocationConstraintProvider_la_DEPENDENCIES) 
-	$(LINK) -rpath $(cimprovidersdir) $(libHA_RuleOfLocationConstraintProvider_la_LDFLAGS) $(libHA_RuleOfLocationConstraintProvider_la_OBJECTS) $(libHA_RuleOfLocationConstraintProvider_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(cimprovidersdir) $(libHA_RuleOfLocationConstraintProvider_la_OBJECTS) $(libHA_RuleOfLocationConstraintProvider_la_LIBADD) $(LIBS)
 libHA_SoftwareIdentityProvider.la: $(libHA_SoftwareIdentityProvider_la_OBJECTS) $(libHA_SoftwareIdentityProvider_la_DEPENDENCIES) 
-	$(LINK) -rpath $(cimprovidersdir) $(libHA_SoftwareIdentityProvider_la_LDFLAGS) $(libHA_SoftwareIdentityProvider_la_OBJECTS) $(libHA_SoftwareIdentityProvider_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(cimprovidersdir) $(libHA_SoftwareIdentityProvider_la_OBJECTS) $(libHA_SoftwareIdentityProvider_la_LIBADD) $(LIBS)
 libHA_SubResourceProvider.la: $(libHA_SubResourceProvider_la_OBJECTS) $(libHA_SubResourceProvider_la_DEPENDENCIES) 
-	$(LINK) -rpath $(cimprovidersdir) $(libHA_SubResourceProvider_la_LDFLAGS) $(libHA_SubResourceProvider_la_OBJECTS) $(libHA_SubResourceProvider_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(cimprovidersdir) $(libHA_SubResourceProvider_la_OBJECTS) $(libHA_SubResourceProvider_la_LIBADD) $(LIBS)
 
 clean-noinstPROGRAMS:
 	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
@@ -819,10 +783,10 @@
 	done
 simpletest$(EXEEXT): $(simpletest_OBJECTS) $(simpletest_DEPENDENCIES) 
 	@rm -f simpletest$(EXEEXT)
-	$(LINK) $(simpletest_LDFLAGS) $(simpletest_OBJECTS) $(simpletest_LDADD) $(LIBS)
+	$(LINK) $(simpletest_OBJECTS) $(simpletest_LDADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -859,37 +823,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -897,10 +849,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -908,7 +856,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -920,15 +874,20 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -949,7 +908,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -960,14 +919,6 @@
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -976,19 +927,22 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -998,10 +952,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -1024,28 +979,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -1056,15 +1006,19 @@
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -1074,8 +1028,9 @@
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
 installdirs: installdirs-recursive
 installdirs-am:
-	$(mkinstalldirs) $(DESTDIR)$(cimprovidersdir)
-
+	for dir in "$(DESTDIR)$(cimprovidersdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -1095,7 +1050,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -1110,24 +1065,34 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
+html: html-recursive
+
 info: info-recursive
 
 info-am:
 
 install-data-am: install-cimprovidersLTLIBRARIES
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -1148,28 +1113,27 @@
 
 ps-am:
 
-uninstall-am: uninstall-cimprovidersLTLIBRARIES uninstall-info-am
+uninstall-am: uninstall-cimprovidersLTLIBRARIES
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-cimprovidersLTLIBRARIES clean-generic clean-libtool \
-	clean-noinstPROGRAMS clean-recursive ctags ctags-recursive \
-	distclean distclean-compile distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-cimprovidersLTLIBRARIES \
+	clean-generic clean-libtool clean-noinstPROGRAMS ctags \
+	ctags-recursive distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am \
 	install-cimprovidersLTLIBRARIES install-data install-data-am \
-	install-data-recursive install-exec install-exec-am \
-	install-exec-recursive install-info install-info-am \
-	install-info-recursive install-man install-recursive \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am installdirs-recursive maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
-	ps-recursive tags tags-recursive uninstall uninstall-am \
-	uninstall-cimprovidersLTLIBRARIES uninstall-info-am \
-	uninstall-info-recursive uninstall-recursive
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
+	uninstall-cimprovidersLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/cim/mof/Makefile.in
+++ b/cim/mof/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -34,16 +34,12 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -55,39 +51,51 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = cim/mof
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/register_providers.sh.in \
+	$(srcdir)/unregister_providers.sh.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES = register_providers.sh unregister_providers.sh
+am__installdirs = "$(DESTDIR)$(mofdir)" "$(DESTDIR)$(mofdir)"
+mofSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(mof_SCRIPTS)
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+mofDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(mof_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -110,8 +118,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -155,8 +161,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -168,6 +172,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -175,12 +180,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -198,8 +199,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -208,15 +207,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -246,8 +242,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -268,8 +262,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -280,20 +272,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -301,17 +281,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -319,6 +301,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -340,6 +323,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -354,56 +338,66 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 MAINTAINERCLEANFILES = Makefile.in
-
 mof_DATA = LinuxHA.mof LinuxHA.reg 
 mof_SCRIPTS = register_providers.sh unregister_providers.sh do_register.sh
 mofdir = @HA_NOARCHDATAHBDIR@/heartbeat/cim
-
 DIST_LIST = $(mof_DATA) $(mof_SCRIPTS)
 EXTRA_DIST = $(DIST_LIST)
-subdir = cim/mof
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES = register_providers.sh unregister_providers.sh
-SCRIPTS = $(mof_SCRIPTS)
-
-DIST_SOURCES =
-DATA = $(mof_DATA)
-
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am \
-	register_providers.sh.in unregister_providers.sh.in
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  cim/mof/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  cim/mof/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-register_providers.sh: $(top_builddir)/config.status register_providers.sh.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+register_providers.sh: $(top_builddir)/config.status $(srcdir)/register_providers.sh.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-unregister_providers.sh: $(top_builddir)/config.status unregister_providers.sh.in
+unregister_providers.sh: $(top_builddir)/config.status $(srcdir)/unregister_providers.sh.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-mofSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 install-mofSCRIPTS: $(mof_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(mofdir)
+	test -z "$(mofdir)" || $(MKDIR_P) "$(DESTDIR)$(mofdir)"
 	@list='$(mof_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(mofSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(mofdir)/$$f"; \
-	    $(mofSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(mofdir)/$$f; \
+	    echo " $(mofSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(mofdir)/$$f'"; \
+	    $(mofSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(mofdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -411,8 +405,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(mof_SCRIPTS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f $(DESTDIR)$(mofdir)/$$f"; \
-	  rm -f $(DESTDIR)$(mofdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(mofdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(mofdir)/$$f"; \
 	done
 
 mostlyclean-libtool:
@@ -420,27 +414,22 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-mofDATA_INSTALL = $(INSTALL_DATA)
 install-mofDATA: $(mof_DATA)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(mofdir)
+	test -z "$(mofdir)" || $(MKDIR_P) "$(DESTDIR)$(mofdir)"
 	@list='$(mof_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(mofDATA_INSTALL) $$d$$p $(DESTDIR)$(mofdir)/$$f"; \
-	  $(mofDATA_INSTALL) $$d$$p $(DESTDIR)$(mofdir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " $(mofDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mofdir)/$$f'"; \
+	  $(mofDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mofdir)/$$f"; \
 	done
 
 uninstall-mofDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(mof_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(mofdir)/$$f"; \
-	  rm -f $(DESTDIR)$(mofdir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(mofdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(mofdir)/$$f"; \
 	done
 tags: TAGS
 TAGS:
@@ -448,28 +437,23 @@
 ctags: CTAGS
 CTAGS:
 
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -483,9 +467,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(SCRIPTS) $(DATA)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(mofdir) $(DESTDIR)$(mofdir)
+	for dir in "$(DESTDIR)$(mofdir)" "$(DESTDIR)$(mofdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -505,7 +490,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -517,24 +502,34 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-mofDATA install-mofSCRIPTS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -553,17 +548,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-mofDATA uninstall-mofSCRIPTS
+uninstall-am: uninstall-mofDATA uninstall-mofSCRIPTS
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-mofDATA install-mofSCRIPTS \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-info-am uninstall-mofDATA \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-mofDATA \
+	install-mofSCRIPTS install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am uninstall uninstall-am uninstall-mofDATA \
 	uninstall-mofSCRIPTS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2006-07-02'
+timestamp='2007-07-22'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -161,6 +161,7 @@
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
@@ -329,7 +330,7 @@
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
-    i86pc:SunOS:5.*:*)
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
@@ -780,7 +781,7 @@
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
-    i*:MINGW*:*)
+    *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
@@ -790,12 +791,15 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[3456]*)
-	echo i586-pc-interix${UNAME_RELEASE}
-	exit ;;
-    EM64T:Interix*:[3456]*)
-	echo x86_64-unknown-interix${UNAME_RELEASE}
-	exit ;;
+    *:Interix*:[3456]*)
+    	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    EM64T | authenticamd)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
@@ -950,6 +954,9 @@
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
+    xtensa:Linux:*:*)
+    	echo xtensa-unknown-linux-gnu
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -1208,6 +1215,15 @@
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2006-09-20'
+timestamp='2007-06-28'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -245,12 +245,12 @@
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
+	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore \
+	| maxq | mb | microblaze | mcore | mep \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -324,7 +324,7 @@
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
@@ -475,8 +475,8 @@
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16c)
-		basic_machine=cr16c-unknown
+	cr16)
+		basic_machine=cr16-unknown
 		os=-elf
 		;;
 	crds | unos)
@@ -683,6 +683,10 @@
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -925,6 +929,9 @@
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@@ -1219,7 +1226,7 @@
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1414,6 +1421,9 @@
 	m68*-cisco)
 		os=-aout
 		;;
+        mep-*)
+		os=-elf
+		;;
 	mips*-cisco)
 		os=-elf
 		;;
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -30,17 +30,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -52,39 +46,38 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = config
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -107,8 +100,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -152,8 +143,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -165,6 +154,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -172,12 +162,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -195,8 +181,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -205,15 +189,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -243,8 +224,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -265,8 +244,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -277,20 +254,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -298,17 +263,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -316,6 +283,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -337,6 +305,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -351,69 +320,78 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 MAINTAINERCLEANFILES = Makefile.in
 EXTRA_DIST = pidtest.c byteorder_test.c
-subdir = config
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  config/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  config/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
 ctags: CTAGS
 CTAGS:
 
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -427,7 +405,6 @@
 check-am: all-am
 check: check-am
 all-am: Makefile
-
 installdirs:
 install: install-am
 install-exec: install-exec-am
@@ -448,7 +425,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -460,24 +437,34 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -496,17 +483,20 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/configure
+++ b/configure
@@ -816,6 +816,7 @@
 INSTALL_PROGRAM
 INSTALL_SCRIPT
 INSTALL_DATA
+am__isrc
 CYGPATH_W
 PACKAGE
 VERSION
@@ -824,13 +825,16 @@
 AUTOMAKE
 AUTOHEADER
 MAKEINFO
-AMTAR
 install_sh
 STRIP
 INSTALL_STRIP_PROGRAM
+mkdir_p
 AWK
 SET_MAKE
 am__leading_dot
+AMTAR
+am__tar
+am__untar
 RPMREL
 HB_PKG
 DISTDIR
@@ -1668,8 +1672,8 @@
 Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-dependency-tracking Speeds up one-time builds
-  --enable-dependency-tracking  Do not reject slow dependency extractors
+  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-static[=PKGS]  build static libraries [default=yes]
   --enable-fast-install[=PKGS]
@@ -2339,7 +2343,8 @@
 if test -z "$HAPKGVERSION" ; then
    HAPKGVERSION="2.1.3"
 fi
-am__api_version="1.7"
+am__api_version='1.10'
+
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -2478,7 +2483,6 @@
 program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
 rm -f conftest.sed
 
-
 # expand $ac_aux_dir to an absolute path
 am_aux_dir=`cd $ac_aux_dir && pwd`
 
@@ -2492,6 +2496,54 @@
 echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+if test -z "$MKDIR_P"; then
+  if test "${ac_cv_path_mkdir+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+done
+IFS=$as_save_IFS
+
+fi
+
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    test -d ./--version && rmdir ./--version
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+echo "${ECHO_T}$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -2573,12 +2625,16 @@
 fi
 rmdir .tst 2>/dev/null
 
- # test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
+  fi
 fi
 
 # test whether we have cygpath
@@ -2621,10 +2677,7 @@
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 
 # Installed binaries are usually stripped using `strip' when the user
 # run `make install-strip'.  However `strip' might not be the right
@@ -2728,10 +2781,17 @@
 fi
 
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
+# Always define AMTAR for backward compatibility.
+
+AMTAR=${AMTAR-"${am_missing_run}tar"}
+
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+
+
 
 
 
@@ -3891,9 +3951,7 @@
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
 fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
+ if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
   AMDEP_FALSE='#'
 else
@@ -3903,7 +3961,6 @@
 
 
 
-
 depcc="$CC"   am_compiler_list=
 
 { echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
@@ -3945,7 +4002,9 @@
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      : > sub/conftst$i.h
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
@@ -3969,13 +4028,19 @@
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
         am_cv_CC_dependencies_compiler_type=$depmode
         break
       fi
@@ -3993,9 +4058,7 @@
 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
-
-
-if
+ if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
   am__fastdepCC_TRUE=
@@ -4894,7 +4957,8 @@
 
 
         # Find any Python interpreter.
-    for ac_prog in python python2 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
+    if test -z "$PYTHON"; then
+      for ac_prog in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -4938,10 +5002,18 @@
 
   test -n "$PYTHON" && break
 done
+test -n "$PYTHON" || PYTHON=":"
 
+    fi
     am_display_PYTHON=python
 
 
+  if test "$PYTHON" = :; then
+      { { echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5
+echo "$as_me: error: no suitable Python interpreter found" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+
 
   { echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5
 echo $ECHO_N "checking for $am_display_PYTHON version... $ECHO_C" >&6; }
@@ -5011,6 +5083,10 @@
 
 
 
+  fi
+
+
+
                  case $enable_ltdl_convenience in
   no) { { echo "$as_me:$LINENO: error: this package needs a convenience libltdl" >&5
 echo "$as_me: error: this package needs a convenience libltdl" >&2;}
@@ -5108,7 +5184,7 @@
   test -z "$as_dir" && as_dir=.
   for lt_ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+      if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
         lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
       fi
     done
@@ -5511,8 +5587,8 @@
 echo "${ECHO_T}no, using $LN_S" >&6; }
 fi
 
-{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
+echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
 if test "${lt_cv_deplibs_check_method+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5553,16 +5629,22 @@
 
 mingw* | pw32*)
   # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
   ;;
 
 darwin* | rhapsody*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu | dragonfly*)
+freebsd* | dragonfly*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
@@ -5600,7 +5682,7 @@
   esac
   ;;
 
-interix3*)
+interix[3-9]*)
   # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
   lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
   ;;
@@ -5616,11 +5698,11 @@
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd*)
+netbsd* | netbsdelf*-gnu)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
   else
@@ -5650,6 +5732,10 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 solaris*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -5736,7 +5822,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5739 "configure"' > conftest.$ac_ext
+  echo '#line 5825 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5771,7 +5857,8 @@
   rm -rf conftest*
   ;;
 
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -5782,6 +5869,9 @@
     case `/usr/bin/file conftest.o` in
     *32-bit*)
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_i386_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_i386"
           ;;
@@ -5798,6 +5888,9 @@
       ;;
     *64-bit*)
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_x86_64_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_x86_64"
           ;;
@@ -6934,7 +7027,9 @@
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      : > sub/conftst$i.h
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
@@ -6958,13 +7053,19 @@
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
         am_cv_CXX_dependencies_compiler_type=$depmode
         break
       fi
@@ -6982,9 +7083,7 @@
 echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
 CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
-
-
-if
+ if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
   am__fastdepCXX_TRUE=
@@ -7579,24 +7678,27 @@
     fi
     ;;
   *)
-    # If test is not a shell built-in, we'll probably end up computing a
-    # maximum length that is only half of the actual maximum length, but
-    # we can't tell.
-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
 	       = "XX$teststring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      teststring=$teststring$teststring
-    done
-    teststring=
-    # Add a significant safety factor because C++ compilers can tack on massive
-    # amounts of additional arguments before passing them to the linker.
-    # It appears as though 1/2 is a usable value.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
+	      lt_cv_sys_max_cmd_len=$new_result &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on massive
+      # amounts of additional arguments before passing them to the linker.
+      # It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
     ;;
   esac
 
@@ -7613,6 +7715,7 @@
 
 
 
+
 # Check for command to grab the raw symbol name followed by C symbol from nm.
 { echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
 echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
@@ -7650,7 +7753,7 @@
   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
   ;;
-linux*)
+linux* | k*bsd*-gnu)
   if test "$host_cpu" = ia64; then
     symcode='[ABCDGIRSTW]'
     lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
@@ -8201,7 +8304,7 @@
 test -z "$ac_objext" && ac_objext=o
 
 # Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
 old_postinstall_cmds='chmod 644 $oldlib'
 old_postuninstall_cmds=
 
@@ -8401,10 +8504,10 @@
 objext=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
+lt_simple_link_test_code='int main(){return(0);}'
 
 
 # If no C compiler was specified, use CC.
@@ -8419,13 +8522,13 @@
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -8445,7 +8548,7 @@
 else
   lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="-fno-rtti -fno-exceptions"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -8456,11 +8559,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8459: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8562: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8463: \$? = $ac_status" >&5
+   echo "$as_me:8566: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8511,13 +8614,15 @@
       lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic='-DDLL_EXPORT'
       ;;
 
@@ -8527,7 +8632,7 @@
       lt_prog_compiler_pic='-fno-common'
       ;;
 
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -8585,7 +8690,7 @@
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic='-DDLL_EXPORT'
@@ -8618,7 +8723,7 @@
       lt_prog_compiler_static='-Bstatic'
       ;;
 
-    linux*)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       icc* | ecc*)
 	lt_prog_compiler_wl='-Wl,'
@@ -8637,6 +8742,22 @@
         # All Alpha code is PIC.
         lt_prog_compiler_static='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -8646,6 +8767,10 @@
       lt_prog_compiler_static='-non_shared'
       ;;
 
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
     solaris*)
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
@@ -8713,7 +8838,7 @@
 else
   lt_prog_compiler_pic_works=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -8724,11 +8849,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8727: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8852: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8731: \$? = $ac_status" >&5
+   echo "$as_me:8856: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8777,7 +8902,7 @@
   lt_prog_compiler_static_works=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -8817,7 +8942,7 @@
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -8828,11 +8953,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8831: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8956: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8835: \$? = $ac_status" >&5
+   echo "$as_me:8960: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9024,7 +9149,7 @@
       allow_undefined_flag=unsupported
       always_export_symbols=no
       enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -9042,7 +9167,7 @@
       fi
       ;;
 
-    interix3*)
+    interix[3-9]*)
       hardcode_direct=no
       hardcode_shlibpath_var=no
       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
@@ -9057,7 +9182,7 @@
       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux*)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@@ -9075,20 +9200,30 @@
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	esac
-	archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
 	if test $supports_anon_versioning = yes; then
 	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
+	link_all_deplibs=no
       else
 	ld_shlibs=no
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -9240,7 +9375,7 @@
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  hardcode_direct=yes
+  	  :
 	  else
   	  # We have old collect2
   	  hardcode_direct=unsupported
@@ -9314,11 +9449,18 @@
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -9373,11 +9515,18 @@
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -9431,7 +9580,7 @@
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds='true'
       # FIXME: Should let the user specify the lib program.
-      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
       fix_srcfile_path='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes=yes
       ;;
@@ -9473,10 +9622,10 @@
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -9516,7 +9665,7 @@
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
+    freebsd* | dragonfly*)
       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
@@ -9618,7 +9767,7 @@
       link_all_deplibs=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -9638,24 +9787,28 @@
       ;;
 
     openbsd*)
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
       else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	ld_shlibs=no
       fi
       ;;
 
@@ -9714,17 +9867,16 @@
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
       *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
  	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       link_all_deplibs=yes
       ;;
@@ -9781,7 +9933,7 @@
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
       no_undefined_flag='${wl}-z,text'
       archive_cmds_need_lc=no
       hardcode_shlibpath_var=no
@@ -9858,7 +10010,7 @@
       { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -9916,17 +10068,55 @@
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
+
 if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
   else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
   fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[lt_foo]++; }
+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`echo $lt_search_path_spec`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi
@@ -10086,12 +10276,8 @@
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -10108,18 +10294,6 @@
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -10157,7 +10331,7 @@
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -10220,7 +10394,7 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -10275,7 +10449,7 @@
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -10289,31 +10463,10 @@
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # find out which ABI we are using
-  libsuff=
-  case "$host_cpu" in
-  x86_64*|s390x*|powerpc64*)
-    echo '#line 10296 "configure"' > conftest.$ac_ext
-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-      case `/usr/bin/file conftest.$ac_objext` in
-      *64-bit*)
-        libsuff=64
-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-        ;;
-      esac
-    fi
-    rm -rf conftest*
-    ;;
-  esac
-
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^	 *//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -10325,7 +10478,7 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
+netbsdelf*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -10334,7 +10487,7 @@
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
+  dynamic_linker='NetBSD ld.elf_so'
   ;;
 
 netbsd*)
@@ -10418,6 +10571,10 @@
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -10571,6 +10728,7 @@
    darwin*)
        if test -n "$STRIP" ; then
          striplib="$STRIP -x"
+         old_striplib="$STRIP -S"
          { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
        else
@@ -11157,7 +11315,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 11160 "configure"
+#line 11318 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11257,7 +11415,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 11260 "configure"
+#line 11418 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11455,6 +11613,7 @@
     module_cmds \
     module_expsym_cmds \
     lt_cv_prog_compiler_c_o \
+    fix_srcfile_path \
     exclude_expsyms \
     include_expsyms; do
 
@@ -11499,7 +11658,7 @@
 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Libtool:
@@ -11823,7 +11982,7 @@
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols
@@ -11992,10 +12151,10 @@
 objext_CXX=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
+lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
@@ -12011,13 +12170,13 @@
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -12276,7 +12435,7 @@
 	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	then
 	  # We have reworked collect2
-	  hardcode_direct_CXX=yes
+	  :
 	else
 	  # We have old collect2
 	  hardcode_direct_CXX=unsupported
@@ -12350,11 +12509,18 @@
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -12410,11 +12576,18 @@
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -12533,10 +12706,10 @@
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
           module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -12570,7 +12743,7 @@
   freebsd-elf*)
     archive_cmds_need_lc_CXX=no
     ;;
-  freebsd* | kfreebsd*-gnu | dragonfly*)
+  freebsd* | dragonfly*)
     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
     # conventions
     ld_shlibs_CXX=yes
@@ -12619,9 +12792,7 @@
       hardcode_libdir_separator_CXX=:
 
       case $host_cpu in
-      hppa*64*|ia64*)
-	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-        ;;
+      hppa*64*|ia64*) ;;
       *)
 	export_dynamic_flag_spec_CXX='${wl}-E'
         ;;
@@ -12689,7 +12860,7 @@
 	;;
     esac
     ;;
-  interix3*)
+  interix[3-9]*)
     hardcode_direct_CXX=no
     hardcode_shlibpath_var_CXX=no
     hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
@@ -12729,7 +12900,7 @@
     hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
     hardcode_libdir_separator_CXX=:
     ;;
-  linux*)
+  linux* | k*bsd*-gnu)
     case $cc_basename in
       KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -12809,6 +12980,29 @@
 	# dependencies.
 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C++ 5.9
+	  no_undefined_flag_CXX=' -zdefs'
+	  archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	  hardcode_libdir_flag_spec_CXX='-R$libdir'
+	  whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+
+	  # Not sure whether something based on
+	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	  # would be better.
+	  output_verbose_link_cmd='echo'
+
+	  # Archives containing C++ object files must be created using
+	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	  # necessary to make sure instantiated templates are included
+	  # in the archive.
+	  old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	  ;;
+	esac
+	;;
     esac
     ;;
   lynxos*)
@@ -12831,7 +13025,7 @@
 	;;
     esac
     ;;
-  netbsd*)
+  netbsd* | netbsdelf*-gnu)
     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
       archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
       wlarc=
@@ -12847,16 +13041,20 @@
     ld_shlibs_CXX=no
     ;;
   openbsd*)
-    hardcode_direct_CXX=yes
-    hardcode_shlibpath_var_CXX=no
-    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-      export_dynamic_flag_spec_CXX='${wl}-E'
-      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    if test -f /usr/libexec/ld.so; then
+      hardcode_direct_CXX=yes
+      hardcode_shlibpath_var_CXX=no
+      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	export_dynamic_flag_spec_CXX='${wl}-E'
+	whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      fi
+      output_verbose_link_cmd='echo'
+    else
+      ld_shlibs_CXX=no
     fi
-    output_verbose_link_cmd='echo'
     ;;
   osf3*)
     case $cc_basename in
@@ -13018,15 +13216,10 @@
 	case $host_os in
 	  solaris2.[0-5] | solaris2.[0-5].*) ;;
 	  *)
-	    # The C++ compiler is used as linker so we must use $wl
-	    # flag to pass the commands to the underlying system
-	    # linker. We must also pass each convience library through
-	    # to the system linker between allextract/defaultextract.
-	    # The C++ compiler will combine linker options so we
-	    # cannot just pass the convience library names through
-	    # without $wl.
+	    # The compiler driver will combine and reorder linker options,
+	    # but understands `-z linker_flag'.
 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+	    whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
 	    ;;
 	esac
 	link_all_deplibs_CXX=yes
@@ -13073,6 +13266,12 @@
 	  fi
 
 	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+	  case $host_os in
+	  solaris2.[0-5] | solaris2.[0-5].*) ;;
+	  *)
+	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    ;;
+	  esac
 	fi
 	;;
     esac
@@ -13264,7 +13463,7 @@
 
 # PORTME: override above test on systems where it is broken
 case $host_os in
-interix3*)
+interix[3-9]*)
   # Interix 3.5 installs completely hosed .la files for C++, so rather than
   # hack all around it, let's just trust "g++" to DTRT.
   predep_objects_CXX=
@@ -13272,13 +13471,46 @@
   postdeps_CXX=
   ;;
 
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+    #
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
 solaris*)
   case $cc_basename in
   CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
     # Adding this requires a known-good setup of shared libraries for
     # Sun compiler versions before 5.6, else PIC objects from an old
     # archive will be linked into the output, leading to subtle bugs.
-    postdeps_CXX='-lCstd -lCrun'
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
     ;;
   esac
   ;;
@@ -13315,12 +13547,14 @@
       # like `-m68040'.
       lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
       ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
-    mingw* | os2* | pw32*)
+    mingw* | cygwin* | os2* | pw32*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
       ;;
     darwin* | rhapsody*)
@@ -13332,7 +13566,7 @@
       # DJGPP does not support shared libraries at all
       lt_prog_compiler_pic_CXX=
       ;;
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -13398,7 +13632,7 @@
 	    ;;
 	esac
 	;;
-      freebsd* | kfreebsd*-gnu | dragonfly*)
+      freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
@@ -13441,7 +13675,7 @@
 	    ;;
 	esac
 	;;
-      linux*)
+      linux* | k*bsd*-gnu)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -13468,6 +13702,14 @@
 	    lt_prog_compiler_static_CXX='-non_shared'
 	    ;;
 	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      lt_prog_compiler_pic_CXX='-KPIC'
+	      lt_prog_compiler_static_CXX='-Bstatic'
+	      lt_prog_compiler_wl_CXX='-Qoption ld '
+	      ;;
+	    esac
 	    ;;
 	esac
 	;;
@@ -13484,7 +13726,7 @@
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | netbsdelf*-gnu)
 	;;
       osf3* | osf4* | osf5*)
 	case $cc_basename in
@@ -13582,7 +13824,7 @@
 else
   lt_prog_compiler_pic_works_CXX=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -13593,11 +13835,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13596: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13838: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13600: \$? = $ac_status" >&5
+   echo "$as_me:13842: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13646,7 +13888,7 @@
   lt_prog_compiler_static_works_CXX=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -13686,7 +13928,7 @@
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -13697,11 +13939,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13700: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13942: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13704: \$? = $ac_status" >&5
+   echo "$as_me:13946: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13767,7 +14009,10 @@
     export_symbols_cmds_CXX="$ltdll_cmds"
   ;;
   cygwin* | mingw*)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+  ;;
+  linux* | k*bsd*-gnu)
+    link_all_deplibs_CXX=no
   ;;
   *)
     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -13798,7 +14043,7 @@
       { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -13856,20 +14101,7 @@
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -14026,12 +14258,7 @@
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -14048,18 +14275,6 @@
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -14097,7 +14312,7 @@
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -14160,7 +14375,7 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -14215,7 +14430,7 @@
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -14229,31 +14444,10 @@
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # find out which ABI we are using
-  libsuff=
-  case "$host_cpu" in
-  x86_64*|s390x*|powerpc64*)
-    echo '#line 14236 "configure"' > conftest.$ac_ext
-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-      case `/usr/bin/file conftest.$ac_objext` in
-      *64-bit*)
-        libsuff=64
-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-        ;;
-      esac
-    fi
-    rm -rf conftest*
-    ;;
-  esac
-
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^	 *//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -14265,7 +14459,7 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
+netbsdelf*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -14274,7 +14468,7 @@
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
+  dynamic_linker='NetBSD ld.elf_so'
   ;;
 
 netbsd*)
@@ -14358,6 +14552,10 @@
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -14552,6 +14750,7 @@
     module_cmds_CXX \
     module_expsym_cmds_CXX \
     lt_cv_prog_compiler_c_o_CXX \
+    fix_srcfile_path_CXX \
     exclude_expsyms_CXX \
     include_expsyms_CXX; do
 
@@ -14872,7 +15071,7 @@
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_CXX"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_CXX
@@ -14963,10 +15162,17 @@
 objext_F77=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
+lt_simple_link_test_code="\
+      program t
+      end
+"
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
@@ -14982,13 +15188,13 @@
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -15075,13 +15281,15 @@
       lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic_F77='-DDLL_EXPORT'
       ;;
 
@@ -15091,7 +15299,7 @@
       lt_prog_compiler_pic_F77='-fno-common'
       ;;
 
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -15149,7 +15357,7 @@
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic_F77='-DDLL_EXPORT'
@@ -15182,7 +15390,7 @@
       lt_prog_compiler_static_F77='-Bstatic'
       ;;
 
-    linux*)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       icc* | ecc*)
 	lt_prog_compiler_wl_F77='-Wl,'
@@ -15201,6 +15409,22 @@
         # All Alpha code is PIC.
         lt_prog_compiler_static_F77='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic_F77='-KPIC'
+	  lt_prog_compiler_static_F77='-Bstatic'
+	  lt_prog_compiler_wl_F77='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic_F77='-KPIC'
+	  lt_prog_compiler_static_F77='-Bstatic'
+	  lt_prog_compiler_wl_F77=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -15210,6 +15434,10 @@
       lt_prog_compiler_static_F77='-non_shared'
       ;;
 
+    rdos*)
+      lt_prog_compiler_static_F77='-non_shared'
+      ;;
+
     solaris*)
       lt_prog_compiler_pic_F77='-KPIC'
       lt_prog_compiler_static_F77='-Bstatic'
@@ -15277,7 +15505,7 @@
 else
   lt_prog_compiler_pic_works_F77=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_F77"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -15288,11 +15516,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15291: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15519: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15295: \$? = $ac_status" >&5
+   echo "$as_me:15523: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15341,7 +15569,7 @@
   lt_prog_compiler_static_works_F77=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15381,7 +15609,7 @@
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -15392,11 +15620,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15395: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15623: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15399: \$? = $ac_status" >&5
+   echo "$as_me:15627: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15588,7 +15816,7 @@
       allow_undefined_flag_F77=unsupported
       always_export_symbols_F77=no
       enable_shared_with_static_runtimes_F77=yes
-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -15606,7 +15834,7 @@
       fi
       ;;
 
-    interix3*)
+    interix[3-9]*)
       hardcode_direct_F77=no
       hardcode_shlibpath_var_F77=no
       hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
@@ -15621,7 +15849,7 @@
       archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux*)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@@ -15639,20 +15867,30 @@
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	esac
-	archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
 	if test $supports_anon_versioning = yes; then
 	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
+	link_all_deplibs_F77=no
       else
 	ld_shlibs_F77=no
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -15804,7 +16042,7 @@
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  hardcode_direct_F77=yes
+  	  :
 	  else
   	  # We have old collect2
   	  hardcode_direct_F77=unsupported
@@ -15868,11 +16106,18 @@
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -15917,11 +16162,18 @@
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -15975,7 +16227,7 @@
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds_F77='true'
       # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
       fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes_F77=yes
       ;;
@@ -16017,10 +16269,10 @@
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -16060,7 +16312,7 @@
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
+    freebsd* | dragonfly*)
       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_F77='-R$libdir'
       hardcode_direct_F77=yes
@@ -16162,7 +16414,7 @@
       link_all_deplibs_F77=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -16182,24 +16434,28 @@
       ;;
 
     openbsd*)
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_F77='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct_F77=yes
+	hardcode_shlibpath_var_F77=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec_F77='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec_F77='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
       else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec_F77='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	ld_shlibs_F77=no
       fi
       ;;
 
@@ -16258,17 +16514,16 @@
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
       *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
  	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       link_all_deplibs_F77=yes
       ;;
@@ -16325,7 +16580,7 @@
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
       no_undefined_flag_F77='${wl}-z,text'
       archive_cmds_need_lc_F77=no
       hardcode_shlibpath_var_F77=no
@@ -16402,7 +16657,7 @@
       { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -16460,20 +16715,7 @@
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -16630,12 +16872,7 @@
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -16652,18 +16889,6 @@
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -16701,7 +16926,7 @@
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -16764,7 +16989,7 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -16819,7 +17044,7 @@
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -16833,31 +17058,10 @@
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # find out which ABI we are using
-  libsuff=
-  case "$host_cpu" in
-  x86_64*|s390x*|powerpc64*)
-    echo '#line 16840 "configure"' > conftest.$ac_ext
-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-      case `/usr/bin/file conftest.$ac_objext` in
-      *64-bit*)
-        libsuff=64
-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-        ;;
-      esac
-    fi
-    rm -rf conftest*
-    ;;
-  esac
-
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^	 *//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -16869,7 +17073,7 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
+netbsdelf*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -16878,7 +17082,7 @@
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
+  dynamic_linker='NetBSD ld.elf_so'
   ;;
 
 netbsd*)
@@ -16962,6 +17166,10 @@
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -17156,6 +17364,7 @@
     module_cmds_F77 \
     module_expsym_cmds_F77 \
     lt_cv_prog_compiler_c_o_F77 \
+    fix_srcfile_path_F77 \
     exclude_expsyms_F77 \
     include_expsyms_F77; do
 
@@ -17476,7 +17685,7 @@
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_F77"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_F77
@@ -17534,10 +17743,10 @@
 objext_GCJ=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
+lt_simple_compile_test_code="class foo {}"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
@@ -17553,13 +17762,13 @@
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -17600,7 +17809,7 @@
 else
   lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="-fno-rtti -fno-exceptions"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -17611,11 +17820,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17614: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17823: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17618: \$? = $ac_status" >&5
+   echo "$as_me:17827: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -17666,13 +17875,15 @@
       lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
       ;;
 
@@ -17682,7 +17893,7 @@
       lt_prog_compiler_pic_GCJ='-fno-common'
       ;;
 
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -17740,7 +17951,7 @@
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
@@ -17773,7 +17984,7 @@
       lt_prog_compiler_static_GCJ='-Bstatic'
       ;;
 
-    linux*)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       icc* | ecc*)
 	lt_prog_compiler_wl_GCJ='-Wl,'
@@ -17792,6 +18003,22 @@
         # All Alpha code is PIC.
         lt_prog_compiler_static_GCJ='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic_GCJ='-KPIC'
+	  lt_prog_compiler_static_GCJ='-Bstatic'
+	  lt_prog_compiler_wl_GCJ='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic_GCJ='-KPIC'
+	  lt_prog_compiler_static_GCJ='-Bstatic'
+	  lt_prog_compiler_wl_GCJ=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -17801,6 +18028,10 @@
       lt_prog_compiler_static_GCJ='-non_shared'
       ;;
 
+    rdos*)
+      lt_prog_compiler_static_GCJ='-non_shared'
+      ;;
+
     solaris*)
       lt_prog_compiler_pic_GCJ='-KPIC'
       lt_prog_compiler_static_GCJ='-Bstatic'
@@ -17868,7 +18099,7 @@
 else
   lt_prog_compiler_pic_works_GCJ=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -17879,11 +18110,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17882: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18113: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17886: \$? = $ac_status" >&5
+   echo "$as_me:18117: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -17932,7 +18163,7 @@
   lt_prog_compiler_static_works_GCJ=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -17972,7 +18203,7 @@
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -17983,11 +18214,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17986: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18217: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17990: \$? = $ac_status" >&5
+   echo "$as_me:18221: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18179,7 +18410,7 @@
       allow_undefined_flag_GCJ=unsupported
       always_export_symbols_GCJ=no
       enable_shared_with_static_runtimes_GCJ=yes
-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -18197,7 +18428,7 @@
       fi
       ;;
 
-    interix3*)
+    interix[3-9]*)
       hardcode_direct_GCJ=no
       hardcode_shlibpath_var_GCJ=no
       hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
@@ -18212,7 +18443,7 @@
       archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux*)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@@ -18230,20 +18461,30 @@
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	esac
-	archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
 	if test $supports_anon_versioning = yes; then
 	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
+	link_all_deplibs_GCJ=no
       else
 	ld_shlibs_GCJ=no
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -18395,7 +18636,7 @@
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  hardcode_direct_GCJ=yes
+  	  :
 	  else
   	  # We have old collect2
   	  hardcode_direct_GCJ=unsupported
@@ -18469,11 +18710,18 @@
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -18528,11 +18776,18 @@
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -18586,7 +18841,7 @@
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds_GCJ='true'
       # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'
       fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes_GCJ=yes
       ;;
@@ -18628,10 +18883,10 @@
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -18671,7 +18926,7 @@
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
+    freebsd* | dragonfly*)
       archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_GCJ='-R$libdir'
       hardcode_direct_GCJ=yes
@@ -18773,7 +19028,7 @@
       link_all_deplibs_GCJ=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -18793,24 +19048,28 @@
       ;;
 
     openbsd*)
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_GCJ='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct_GCJ=yes
+	hardcode_shlibpath_var_GCJ=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec_GCJ='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec_GCJ='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
       else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	ld_shlibs_GCJ=no
       fi
       ;;
 
@@ -18869,17 +19128,16 @@
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
       *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
  	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       link_all_deplibs_GCJ=yes
       ;;
@@ -18936,7 +19194,7 @@
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
       no_undefined_flag_GCJ='${wl}-z,text'
       archive_cmds_need_lc_GCJ=no
       hardcode_shlibpath_var_GCJ=no
@@ -19013,7 +19271,7 @@
       { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -19071,20 +19329,7 @@
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -19241,12 +19486,7 @@
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -19263,18 +19503,6 @@
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -19312,7 +19540,7 @@
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -19375,7 +19603,7 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -19430,7 +19658,7 @@
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -19444,31 +19672,10 @@
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # find out which ABI we are using
-  libsuff=
-  case "$host_cpu" in
-  x86_64*|s390x*|powerpc64*)
-    echo '#line 19451 "configure"' > conftest.$ac_ext
-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-      case `/usr/bin/file conftest.$ac_objext` in
-      *64-bit*)
-        libsuff=64
-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-        ;;
-      esac
-    fi
-    rm -rf conftest*
-    ;;
-  esac
-
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^	 *//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -19480,7 +19687,7 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
+netbsdelf*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -19489,7 +19696,7 @@
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
+  dynamic_linker='NetBSD ld.elf_so'
   ;;
 
 netbsd*)
@@ -19573,6 +19780,10 @@
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -19767,6 +19978,7 @@
     module_cmds_GCJ \
     module_expsym_cmds_GCJ \
     lt_cv_prog_compiler_c_o_GCJ \
+    fix_srcfile_path_GCJ \
     exclude_expsyms_GCJ \
     include_expsyms_GCJ; do
 
@@ -20087,7 +20299,7 @@
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_GCJ"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_GCJ
@@ -20144,7 +20356,7 @@
 objext_RC=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
 
 # Code to be used in simple link tests
 lt_simple_link_test_code="$lt_simple_compile_test_code"
@@ -20163,13 +20375,13 @@
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -20247,6 +20459,7 @@
     module_cmds_RC \
     module_expsym_cmds_RC \
     lt_cv_prog_compiler_c_o_RC \
+    fix_srcfile_path_RC \
     exclude_expsyms_RC \
     include_expsyms_RC; do
 
@@ -20567,7 +20780,7 @@
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_RC"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_RC
@@ -22518,9 +22731,7 @@
 echo "${ECHO_T}no" >&6; }
 fi
 rm -f $F
-
-
-if test "$nonroot_chown" = yes ; then
+ if test "$nonroot_chown" = yes ; then
   NONROOT_CHOWN_TRUE=
   NONROOT_CHOWN_FALSE='#'
 else
@@ -30146,7 +30357,7 @@
 CPPFLAGS="$CPPFLAGS $XML2HEAD"
 
 
-for ac_header in linux/icmpv6.h
+for ac_header in netinet/icmp6.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -30160,7 +30371,7 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <asm/types.h>
+#include <sys/types.h>
 
 #include <$ac_header>
 _ACEOF
@@ -30203,9 +30414,7 @@
 
 done
 
-
-
-if test "$ac_cv_header_linux_icmpv6_h" = yes -a $new_libnet = yes ; then
+ if test "$ac_cv_header_netinet_icmp6_h" = yes -a $new_libnet = yes ; then
   USE_IPV6ADDR_TRUE=
   USE_IPV6ADDR_FALSE='#'
 else
@@ -30354,9 +30563,7 @@
 done
 
 
-
-
-if test "$ac_cv_header_vacmclient_api_h" = yes; then
+ if test "$ac_cv_header_vacmclient_api_h" = yes; then
   USE_VACM_TRUE=
   USE_VACM_FALSE='#'
 else
@@ -30364,9 +30571,7 @@
   USE_VACM_FALSE=
 fi
 
-
-
-if test "$ac_cv_header_curl_curl_h" = yes -a "$ac_cv_header_libxml_xpath_h" = yes; then
+ if test "$ac_cv_header_curl_curl_h" = yes -a "$ac_cv_header_libxml_xpath_h" = yes; then
   USE_DRAC3_TRUE=
   USE_DRAC3_FALSE='#'
 else
@@ -30374,9 +30579,7 @@
   USE_DRAC3_FALSE=
 fi
 
-
-
-if test "$ac_cv_header_openhpi_SaHpi_h" = yes && pkg-config --atleast-version 2.6 openhpi; then
+ if test "$ac_cv_header_openhpi_SaHpi_h" = yes && pkg-config --atleast-version 2.6 openhpi; then
   USE_OPENHPI_TRUE=
   USE_OPENHPI_FALSE='#'
 else
@@ -30972,9 +31175,7 @@
 
 
 
-
-
-if test "$ENABLE_SNMP" = "yes"; then
+ if test "$ENABLE_SNMP" = "yes"; then
   USE_APC_SNMP_TRUE=
   USE_APC_SNMP_FALSE='#'
 else
@@ -30982,9 +31183,7 @@
   USE_APC_SNMP_FALSE=
 fi
 
-
-
-if test "x${enable_snmp_subagent}" = "xyes"; then
+ if test "x${enable_snmp_subagent}" = "xyes"; then
   SNMP_SUBAGENT_BUILD_TRUE=
   SNMP_SUBAGENT_BUILD_FALSE='#'
 else
@@ -31053,9 +31252,7 @@
 else
 	enable_ipmilan="no"
 fi
-
-
-if test "X$enable_ipmilan" = "Xyes"; then
+ if test "X$enable_ipmilan" = "Xyes"; then
   IPMILAN_BUILD_TRUE=
   IPMILAN_BUILD_FALSE='#'
 else
@@ -31447,9 +31644,7 @@
 fi
 
 
-
-
-if test "x${tipc_headers_found}" = "xyes" && test "x${enable_tipc}" != "xno"; then
+ if test "x${tipc_headers_found}" = "xyes" && test "x${enable_tipc}" != "xno"; then
   BUILD_TIPC_MODULE_TRUE=
   BUILD_TIPC_MODULE_FALSE='#'
 else
@@ -31812,9 +32007,7 @@
         fi
 fi
 
-
-
-if test "x${enable_cim_provider}" = "xyes"; then
+ if test "x${enable_cim_provider}" = "xyes"; then
   CIM_PROVIDER_BUILD_TRUE=
   CIM_PROVIDER_BUILD_FALSE='#'
 else
@@ -31827,9 +32020,7 @@
 
 
 
-
-
-if test "x${enable_thread_safe}" = "xyes"; then
+ if test "x${enable_thread_safe}" = "xyes"; then
   ENABLE_THREAD_SAFE_TRUE=
   ENABLE_THREAD_SAFE_FALSE='#'
 else
@@ -34879,9 +35070,7 @@
   enable_ldirectord=yes
 fi
 
-
-
-if test "X$enable_ldirectord" = "Xyes"; then
+ if test "X$enable_ldirectord" = "Xyes"; then
   LDIRECTORD_BUILD_TRUE=
   LDIRECTORD_BUILD_FALSE='#'
 else
@@ -38170,9 +38359,7 @@
   hbaping_build="no"
 fi
 
-
-
-if test "x${hbaping_build}" = "xyes"; then
+ if test "x${hbaping_build}" = "xyes"; then
   HBAAPI_BUILD_TRUE=
   HBAAPI_BUILD_FALSE='#'
 else
@@ -38397,9 +38584,7 @@
   zlib_intalled="no"
 fi
 
-
-
-if test "x${zlib_installed}" = "xyes"; then
+ if test "x${zlib_installed}" = "xyes"; then
   BUILD_ZLIB_COMPRESS_MODULE_TRUE=
   BUILD_ZLIB_COMPRESS_MODULE_FALSE='#'
 else
@@ -38625,9 +38810,7 @@
   bz2_intalled="no"
 fi
 
-
-
-if test "x${bz2_installed}" = "xyes"; then
+ if test "x${bz2_installed}" = "xyes"; then
   BUILD_BZ2_COMPRESS_MODULE_TRUE=
   BUILD_BZ2_COMPRESS_MODULE_FALSE='#'
 else
@@ -38852,9 +39035,7 @@
   openais_intalled="no"
 fi
 
-
-
-if test "x${openais_installed}" = "xyes"; then
+ if test "x${openais_installed}" = "xyes"; then
   BUILD_OPENAIS_MODULE_TRUE=
   BUILD_OPENAIS_MODULE_FALSE='#'
 else
@@ -39169,9 +39350,7 @@
 { echo "$as_me:$LINENO: whether to enable the Cluster Resource Manager... ${enable_crm}" >&5
 echo "$as_me: whether to enable the Cluster Resource Manager... ${enable_crm}" >&6;}
 
-
-
-if test "x${enable_crm}" = "xyes"; then
+ if test "x${enable_crm}" = "xyes"; then
   CRM_BUILD_TRUE=
   CRM_BUILD_FALSE='#'
 else
@@ -39221,9 +39400,7 @@
 fi
 
 
-
-
-if test "x${enable_lrm}" = "xyes"; then
+ if test "x${enable_lrm}" = "xyes"; then
   LRM_BUILD_TRUE=
   LRM_BUILD_FALSE='#'
 else
@@ -39765,9 +39942,7 @@
 fi
 
 
-
-
-if test "x${enable_mgmt}" != "xno"; then
+ if test "x${enable_mgmt}" != "xno"; then
   MGMT_BUILD_TRUE=
   MGMT_BUILD_FALSE='#'
 else
@@ -39812,9 +39987,7 @@
 fi
 
 
-
-
-if test "x${enable_quorumd}" != "xno"; then
+ if test "x${enable_quorumd}" != "xno"; then
   QUORUMD_BUILD_TRUE=
   QUORUMD_BUILD_FALSE='#'
 else
@@ -39863,9 +40036,7 @@
 
 
 
-
-
-if test "x${enable_tsa_plugin}" != "xno"; then
+ if test "x${enable_tsa_plugin}" != "xno"; then
   TSA_PLUGIN_BUILD_TRUE=
   TSA_PLUGIN_BUILD_FALSE='#'
 else
@@ -39889,9 +40060,7 @@
  	;;
 esac
 
-
-
-if test "x${enable_dopd}" != "xno"; then
+ if test "x${enable_dopd}" != "xno"; then
   BUILD_DRBD_OUTDATE_PEER_TRUE=
   BUILD_DRBD_OUTDATE_PEER_FALSE='#'
 else
@@ -40822,6 +40991,7 @@
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
@@ -41233,6 +41403,7 @@
 INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
 INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
 INSTALL_DATA!$INSTALL_DATA$ac_delim
+am__isrc!$am__isrc$ac_delim
 CYGPATH_W!$CYGPATH_W$ac_delim
 PACKAGE!$PACKAGE$ac_delim
 VERSION!$VERSION$ac_delim
@@ -41241,13 +41412,16 @@
 AUTOMAKE!$AUTOMAKE$ac_delim
 AUTOHEADER!$AUTOHEADER$ac_delim
 MAKEINFO!$MAKEINFO$ac_delim
-AMTAR!$AMTAR$ac_delim
 install_sh!$install_sh$ac_delim
 STRIP!$STRIP$ac_delim
 INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
+mkdir_p!$mkdir_p$ac_delim
 AWK!$AWK$ac_delim
 SET_MAKE!$SET_MAKE$ac_delim
 am__leading_dot!$am__leading_dot$ac_delim
+AMTAR!$AMTAR$ac_delim
+am__tar!$am__tar$ac_delim
+am__untar!$am__untar$ac_delim
 RPMREL!$RPMREL$ac_delim
 HB_PKG!$HB_PKG$ac_delim
 DISTDIR!$DISTDIR$ac_delim
@@ -41278,10 +41452,6 @@
 HA_LIBDIR!$HA_LIBDIR$ac_delim
 HA_DATADIR!$HA_DATADIR$ac_delim
 HA_NOARCHDATAHBDIR!$HA_NOARCHDATAHBDIR$ac_delim
-HA_LIBHBDIR!$HA_LIBHBDIR$ac_delim
-HA_VARRUNDIR!$HA_VARRUNDIR$ac_delim
-HA_VARRUNHBDIR!$HA_VARRUNHBDIR$ac_delim
-HA_VARRUNHBRSCDIR!$HA_VARRUNHBRSCDIR$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -41323,6 +41493,10 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+HA_LIBHBDIR!$HA_LIBHBDIR$ac_delim
+HA_VARRUNDIR!$HA_VARRUNDIR$ac_delim
+HA_VARRUNHBDIR!$HA_VARRUNHBDIR$ac_delim
+HA_VARRUNHBRSCDIR!$HA_VARRUNHBRSCDIR$ac_delim
 HA_VARLOCKDIR!$HA_VARLOCKDIR$ac_delim
 HA_VARLIBDIR!$HA_VARLIBDIR$ac_delim
 HA_VARLIBHBDIR!$HA_VARLIBHBDIR$ac_delim
@@ -41416,10 +41590,6 @@
 USE_IPV6ADDR_FALSE!$USE_IPV6ADDR_FALSE$ac_delim
 USE_VACM_TRUE!$USE_VACM_TRUE$ac_delim
 USE_VACM_FALSE!$USE_VACM_FALSE$ac_delim
-USE_DRAC3_TRUE!$USE_DRAC3_TRUE$ac_delim
-USE_DRAC3_FALSE!$USE_DRAC3_FALSE$ac_delim
-USE_OPENHPI_TRUE!$USE_OPENHPI_TRUE$ac_delim
-USE_OPENHPI_FALSE!$USE_OPENHPI_FALSE$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -41461,6 +41631,10 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+USE_DRAC3_TRUE!$USE_DRAC3_TRUE$ac_delim
+USE_DRAC3_FALSE!$USE_DRAC3_FALSE$ac_delim
+USE_OPENHPI_TRUE!$USE_OPENHPI_TRUE$ac_delim
+USE_OPENHPI_FALSE!$USE_OPENHPI_FALSE$ac_delim
 SNMPCONFIG!$SNMPCONFIG$ac_delim
 SNMP_RPM_BUILD_REQUIRES!$SNMP_RPM_BUILD_REQUIRES$ac_delim
 MIBS_DIR!$MIBS_DIR$ac_delim
@@ -41554,10 +41728,6 @@
 TSA_DIR!$TSA_DIR$ac_delim
 TSA_PLUGIN_BUILD_TRUE!$TSA_PLUGIN_BUILD_TRUE$ac_delim
 TSA_PLUGIN_BUILD_FALSE!$TSA_PLUGIN_BUILD_FALSE$ac_delim
-BUILD_DRBD_OUTDATE_PEER_TRUE!$BUILD_DRBD_OUTDATE_PEER_TRUE$ac_delim
-BUILD_DRBD_OUTDATE_PEER_FALSE!$BUILD_DRBD_OUTDATE_PEER_FALSE$ac_delim
-hb_libdir!$hb_libdir$ac_delim
-HA_PLUGIN_DIR!$HA_PLUGIN_DIR$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -41599,6 +41769,10 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+BUILD_DRBD_OUTDATE_PEER_TRUE!$BUILD_DRBD_OUTDATE_PEER_TRUE$ac_delim
+BUILD_DRBD_OUTDATE_PEER_FALSE!$BUILD_DRBD_OUTDATE_PEER_FALSE$ac_delim
+hb_libdir!$hb_libdir$ac_delim
+HA_PLUGIN_DIR!$HA_PLUGIN_DIR$ac_delim
 LRM_PLUGIN_DIR!$LRM_PLUGIN_DIR$ac_delim
 HB_RA_DIR!$HB_RA_DIR$ac_delim
 OCF_ROOT_DIR!$OCF_ROOT_DIR$ac_delim
@@ -41615,7 +41789,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 14; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 18; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -41842,6 +42016,11 @@
   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
   *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
   esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
@@ -41895,6 +42074,7 @@
 s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" >$tmp/out
 
@@ -42059,8 +42239,9 @@
   # some people rename them; so instead we look at the file content.
   # Grep'ing the first line is not enough: some people post-process
   # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+  # Grep'ing the whole file is not good either: AIX grep has a line
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
     dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \
@@ -42087,27 +42268,21 @@
   else
     continue
   fi
-  grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
-  # Extract the definition of DEP_FILES from the Makefile without
-  # running `make'.
-  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
+  # Extract the definition of DEPDIR, am__include, and am__quote
+  # from the Makefile without running `make'.
+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
   test -z "$DEPDIR" && continue
+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
+  test -z "am__include" && continue
+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
   # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n -e '/^U = / s///p' < "$mf"`
-  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-  # We invoke sed twice because it is the simplest approach to
-  # changing $(DEPDIR) to its actual value in the expansion.
-  for file in `sed -n -e '
-    /^DEP_FILES = .*\\\\$/ {
-      s/^DEP_FILES = //
-      :loop
-	s/\\\\$//
-	p
-	n
-	/\\\\$/ b loop
-      p
-    }
-    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+  U=`sed -n 's/^U = //p' < "$mf"`
+  # Find all dependency output files, they are included files with
+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
+  # simplest approach to changing $(DEPDIR) to its actual value in the
+  # expansion.
+  for file in `sed -n "
+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
     # Make sure the directory exists.
     test -f "$dirpart/$file" && continue
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,17 +13,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,40 +29,51 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 @BUILD_DRBD_OUTDATE_PEER_TRUE@am__append_1 = drbd-outdate-peer
+subdir = contrib
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = ipfail mlock drbd-outdate-peer
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -91,8 +96,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -136,8 +139,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -149,6 +150,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -156,12 +158,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -179,8 +177,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -189,15 +185,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -227,8 +220,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -249,8 +240,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -261,20 +250,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -282,17 +259,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -300,6 +279,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -321,6 +301,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -335,12 +316,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # heartbeat contrib directory: Linux-HA code
@@ -362,31 +346,39 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 SUBDIRS = ipfail mlock $(am__append_1)
-subdir = contrib
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-DIST_SUBDIRS = ipfail mlock drbd-outdate-peer
 all: all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  contrib/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  contrib/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -394,10 +386,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -405,7 +393,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -417,15 +411,20 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -446,7 +445,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -457,14 +456,6 @@
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -473,19 +464,22 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -495,10 +489,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -521,28 +516,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -555,13 +545,17 @@
 	done
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -571,7 +565,6 @@
 all-am: Makefile
 installdirs: installdirs-recursive
 installdirs-am:
-
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -591,7 +584,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -603,25 +596,34 @@
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
+html: html-recursive
+
 info: info-recursive
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -640,26 +642,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
-	install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
-	install-recursive install-strip installcheck installcheck-am \
-	installdirs installdirs-am installdirs-recursive \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-recursive
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/contrib/drbd-outdate-peer/Makefile.in
+++ b/contrib/drbd-outdate-peer/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,66 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+halib_PROGRAMS = dopd$(EXEEXT) drbd-peer-outdater$(EXEEXT)
+subdir = contrib/drbd-outdate-peer
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(halibdir)"
+halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(halib_PROGRAMS)
+am_dopd_OBJECTS = dopd.$(OBJEXT)
+dopd_OBJECTS = $(am_dopd_OBJECTS)
+am__DEPENDENCIES_1 =
+dopd_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
+	$(top_builddir)/lib/hbclient/libhbclient.la \
+	$(am__DEPENDENCIES_1)
+am_drbd_peer_outdater_OBJECTS = drbd-peer-outdater.$(OBJEXT)
+drbd_peer_outdater_OBJECTS = $(am_drbd_peer_outdater_OBJECTS)
+drbd_peer_outdater_DEPENDENCIES =  \
+	$(top_builddir)/lib/clplumbing/libplumb.la
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(dopd_SOURCES) $(drbd_peer_outdater_SOURCES)
+DIST_SOURCES = $(dopd_SOURCES) $(drbd_peer_outdater_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +112,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +155,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +166,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +174,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +193,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +201,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +236,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +256,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +266,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +275,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +295,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +317,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +332,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # heartbeat: Linux-HA heartbeat code
@@ -361,86 +362,64 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
 			-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
 			-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
 
-
 halibdir = $(libdir)/@HB_PKG@
-
 havarlibdir = $(localstatedir)/lib/@HB_PKG@
-
 apigid = @HA_APIGID@
-
-# ipfailuid		= @HA_CCMUID@
-halib_PROGRAMS = dopd drbd-peer-outdater
-
 dopd_SOURCES = dopd.c dopd.h
 dopd_LDADD = \
 			$(top_builddir)/lib/clplumbing/libplumb.la		\
 			$(top_builddir)/lib/hbclient/libhbclient.la $(GLIBLIB)
 
-
 drbd_peer_outdater_SOURCES = drbd-peer-outdater.c
 drbd_peer_outdater_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la
-subdir = contrib/drbd-outdate-peer
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-halib_PROGRAMS = dopd$(EXEEXT) drbd-peer-outdater$(EXEEXT)
-PROGRAMS = $(halib_PROGRAMS)
-
-am_dopd_OBJECTS = dopd.$(OBJEXT)
-dopd_OBJECTS = $(am_dopd_OBJECTS)
-dopd_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/hbclient/libhbclient.la
-dopd_LDFLAGS =
-am_drbd_peer_outdater_OBJECTS = drbd-peer-outdater.$(OBJEXT)
-drbd_peer_outdater_OBJECTS = $(am_drbd_peer_outdater_OBJECTS)
-drbd_peer_outdater_DEPENDENCIES = \
-	$(top_builddir)/lib/clplumbing/libplumb.la
-drbd_peer_outdater_LDFLAGS =
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dopd.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/drbd-peer-outdater.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(dopd_SOURCES) $(drbd_peer_outdater_SOURCES)
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(dopd_SOURCES) $(drbd_peer_outdater_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  contrib/drbd-outdate-peer/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  contrib/drbd-outdate-peer/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-halibPROGRAMS: $(halib_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	test -z "$(halibdir)" || $(MKDIR_P) "$(DESTDIR)$(halibdir)"
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -448,8 +427,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(halibdir)/$$f"; \
-	  rm -f $(DESTDIR)$(halibdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(halibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(halibdir)/$$f"; \
 	done
 
 clean-halibPROGRAMS:
@@ -460,13 +439,13 @@
 	done
 dopd$(EXEEXT): $(dopd_OBJECTS) $(dopd_DEPENDENCIES) 
 	@rm -f dopd$(EXEEXT)
-	$(LINK) $(dopd_LDFLAGS) $(dopd_OBJECTS) $(dopd_LDADD) $(LIBS)
+	$(LINK) $(dopd_OBJECTS) $(dopd_LDADD) $(LIBS)
 drbd-peer-outdater$(EXEEXT): $(drbd_peer_outdater_OBJECTS) $(drbd_peer_outdater_DEPENDENCIES) 
 	@rm -f drbd-peer-outdater$(EXEEXT)
-	$(LINK) $(drbd_peer_outdater_LDFLAGS) $(drbd_peer_outdater_OBJECTS) $(drbd_peer_outdater_LDADD) $(LIBS)
+	$(LINK) $(drbd_peer_outdater_OBJECTS) $(drbd_peer_outdater_LDADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -475,37 +454,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drbd-peer-outdater.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -513,18 +480,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -533,6 +488,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -544,10 +500,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -570,28 +527,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -605,9 +557,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	for dir in "$(DESTDIR)$(halibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -627,7 +580,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -635,30 +588,41 @@
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
-clean-am: clean-generic clean-halibPROGRAMS clean-libtool mostlyclean-am
+clean-am: clean-generic clean-halibPROGRAMS clean-libtool \
+	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-halibPROGRAMS
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-exec-local
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -679,20 +643,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-halibPROGRAMS uninstall-info-am uninstall-local
+uninstall-am: uninstall-halibPROGRAMS uninstall-local
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-halibPROGRAMS clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-exec-local install-halibPROGRAMS \
-	install-info install-info-am install-man install-strip \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-exec-local \
+	install-halibPROGRAMS install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-halibPROGRAMS \
-	uninstall-info-am uninstall-local
+	uninstall-local
 
 
 # additional installations not covered normally
--- a/contrib/ipfail/Makefile.in
+++ b/contrib/ipfail/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,62 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+halib_PROGRAMS = ipfail$(EXEEXT)
+subdir = contrib/ipfail
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(halibdir)"
+halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(halib_PROGRAMS)
+am_ipfail_OBJECTS = ipfail.$(OBJEXT)
+ipfail_OBJECTS = $(am_ipfail_OBJECTS)
+am__DEPENDENCIES_1 =
+ipfail_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
+	$(top_builddir)/lib/hbclient/libhbclient.la \
+	$(am__DEPENDENCIES_1)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(ipfail_SOURCES)
+DIST_SOURCES = $(ipfail_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +108,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +151,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +162,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +170,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +189,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +197,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +232,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +252,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +262,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +271,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +291,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +313,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +328,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # heartbeat: Linux-HA heartbeat code
@@ -361,77 +358,63 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
 			-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
 			-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
 
-
 halibdir = $(libdir)/@HB_PKG@
-
 havarlibdir = $(localstatedir)/lib/@HB_PKG@
-
 apigid = @HA_APIGID@
 ipfailuid = @HA_CCMUID@
-
-halib_PROGRAMS = ipfail
-
 ipfail_SOURCES = ipfail.c ipfail.h
 ipfail_LDADD = \
 			$(top_builddir)/lib/clplumbing/libplumb.la \
 			$(top_builddir)/lib/hbclient/libhbclient.la $(GLIBLIB)
 
-subdir = contrib/ipfail
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-halib_PROGRAMS = ipfail$(EXEEXT)
-PROGRAMS = $(halib_PROGRAMS)
-
-am_ipfail_OBJECTS = ipfail.$(OBJEXT)
-ipfail_OBJECTS = $(am_ipfail_OBJECTS)
-ipfail_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/hbclient/libhbclient.la
-ipfail_LDFLAGS =
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ipfail.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(ipfail_SOURCES)
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(ipfail_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  contrib/ipfail/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  contrib/ipfail/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-halibPROGRAMS: $(halib_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	test -z "$(halibdir)" || $(MKDIR_P) "$(DESTDIR)$(halibdir)"
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -439,8 +422,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(halibdir)/$$f"; \
-	  rm -f $(DESTDIR)$(halibdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(halibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(halibdir)/$$f"; \
 	done
 
 clean-halibPROGRAMS:
@@ -451,10 +434,10 @@
 	done
 ipfail$(EXEEXT): $(ipfail_OBJECTS) $(ipfail_DEPENDENCIES) 
 	@rm -f ipfail$(EXEEXT)
-	$(LINK) $(ipfail_LDFLAGS) $(ipfail_OBJECTS) $(ipfail_LDADD) $(LIBS)
+	$(LINK) $(ipfail_OBJECTS) $(ipfail_LDADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -462,37 +445,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipfail.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -500,18 +471,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -520,6 +479,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -531,10 +491,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -557,28 +518,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -592,9 +548,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	for dir in "$(DESTDIR)$(halibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -614,7 +571,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -622,30 +579,41 @@
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
-clean-am: clean-generic clean-halibPROGRAMS clean-libtool mostlyclean-am
+clean-am: clean-generic clean-halibPROGRAMS clean-libtool \
+	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-halibPROGRAMS
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-exec-local
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -666,20 +634,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-halibPROGRAMS uninstall-info-am uninstall-local
+uninstall-am: uninstall-halibPROGRAMS uninstall-local
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-halibPROGRAMS clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-exec-local install-halibPROGRAMS \
-	install-info install-info-am install-man install-strip \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-exec-local \
+	install-halibPROGRAMS install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-halibPROGRAMS \
-	uninstall-info-am uninstall-local
+	uninstall-local
 
 
 # additional installations not covered normally
--- a/contrib/mlock/Makefile.in
+++ b/contrib/mlock/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,61 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+halib_PROGRAMS = mlock$(EXEEXT)
+subdir = contrib/mlock
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(halibdir)"
+halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(halib_PROGRAMS)
+am_mlock_OBJECTS = mlock.$(OBJEXT)
+mlock_OBJECTS = $(am_mlock_OBJECTS)
+am__DEPENDENCIES_1 =
+mlock_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(top_builddir)/replace/libreplace.la
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(mlock_SOURCES)
+DIST_SOURCES = $(mlock_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +107,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +150,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +161,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +169,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +188,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +196,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +231,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +251,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +261,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +270,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +290,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +312,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +327,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # heartbeat: multi clients lock test code
@@ -361,70 +357,58 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
                         -I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
                         -I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
 
-
 halibdir = $(libdir)/@HB_PKG@
-
 havarlibdir = $(localstatedir)/lib/@HB_PKG@
-
-halib_PROGRAMS = mlock
-
 mlock_SOURCES = mlock.c
 mlock_LDADD = $(GLIBLIB) $(top_builddir)/replace/libreplace.la
-subdir = contrib/mlock
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-halib_PROGRAMS = mlock$(EXEEXT)
-PROGRAMS = $(halib_PROGRAMS)
-
-am_mlock_OBJECTS = mlock.$(OBJEXT)
-mlock_OBJECTS = $(am_mlock_OBJECTS)
-mlock_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
-mlock_LDFLAGS =
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/mlock.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(mlock_SOURCES)
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(mlock_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  contrib/mlock/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  contrib/mlock/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-halibPROGRAMS: $(halib_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	test -z "$(halibdir)" || $(MKDIR_P) "$(DESTDIR)$(halibdir)"
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -432,8 +416,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(halibdir)/$$f"; \
-	  rm -f $(DESTDIR)$(halibdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(halibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(halibdir)/$$f"; \
 	done
 
 clean-halibPROGRAMS:
@@ -444,10 +428,10 @@
 	done
 mlock$(EXEEXT): $(mlock_OBJECTS) $(mlock_DEPENDENCIES) 
 	@rm -f mlock$(EXEEXT)
-	$(LINK) $(mlock_LDFLAGS) $(mlock_OBJECTS) $(mlock_LDADD) $(LIBS)
+	$(LINK) $(mlock_OBJECTS) $(mlock_LDADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -455,37 +439,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mlock.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -493,18 +465,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -513,6 +473,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -524,10 +485,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -550,28 +512,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -585,9 +542,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	for dir in "$(DESTDIR)$(halibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -607,7 +565,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -615,30 +573,41 @@
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
-clean-am: clean-generic clean-halibPROGRAMS clean-libtool mostlyclean-am
+clean-am: clean-generic clean-halibPROGRAMS clean-libtool \
+	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-halibPROGRAMS
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-exec-local
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -659,20 +628,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-halibPROGRAMS uninstall-info-am uninstall-local
+uninstall-am: uninstall-halibPROGRAMS uninstall-local
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-halibPROGRAMS clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-exec-local install-halibPROGRAMS \
-	install-info install-info-am install-man install-strip \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-exec-local \
+	install-halibPROGRAMS install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-halibPROGRAMS \
-	uninstall-info-am uninstall-local
+	uninstall-local
 
 
 # additional installations not covered normally
--- a/crm/Makefile.in
+++ b/crm/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,52 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = crm
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(dtddir)"
+dtdSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(dtd_SCRIPTS)
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +98,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +141,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +152,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +160,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +179,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +187,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +222,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +242,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +252,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +261,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +281,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +303,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +318,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # Copyright (C) 2004 Andrew Beekhof
@@ -359,50 +346,54 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 SUBDIRS = cib crmd pengine tengine admin
 DIST_SUBDIRS = cib crmd pengine tengine admin
-
 dtddir = $(HA_NOARCHDATAHBDIR)
 crm_varlibdir = $(HA_VARLIBDIR)/$(HB_PKG)/crm
 crm_varrundir = $(HA_VARRUNDIR)/$(HB_PKG)/crm
-
 EXTRA_DIST = crm-1.0.dtd
 dtd_SCRIPTS = crm.dtd
-subdir = crm
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-SCRIPTS = $(dtd_SCRIPTS)
-
-DIST_SOURCES =
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive
-DIST_COMMON = README $(srcdir)/Makefile.in Makefile.am
 all: all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  crm/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  crm/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-dtdSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-dtdSCRIPTS: $(dtd_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(dtddir)
+	test -z "$(dtddir)" || $(MKDIR_P) "$(DESTDIR)$(dtddir)"
 	@list='$(dtd_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(dtdSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(dtddir)/$$f"; \
-	    $(dtdSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(dtddir)/$$f; \
+	    echo " $(dtdSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(dtddir)/$$f'"; \
+	    $(dtdSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(dtddir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -410,8 +401,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dtd_SCRIPTS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f $(DESTDIR)$(dtddir)/$$f"; \
-	  rm -f $(DESTDIR)$(dtddir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(dtddir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(dtddir)/$$f"; \
 	done
 
 mostlyclean-libtool:
@@ -420,10 +411,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -431,7 +418,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -443,15 +436,20 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -472,7 +470,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -483,14 +481,6 @@
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -499,19 +489,22 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -521,10 +514,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -547,28 +541,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -581,13 +570,17 @@
 	done
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -597,8 +590,9 @@
 all-am: Makefile $(SCRIPTS)
 installdirs: installdirs-recursive
 installdirs-am:
-	$(mkinstalldirs) $(DESTDIR)$(dtddir)
-
+	for dir in "$(DESTDIR)$(dtddir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -618,7 +612,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -630,25 +624,34 @@
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
+html: html-recursive
+
 info: info-recursive
 
 info-am:
 
 install-data-am: install-dtdSCRIPTS
 
+install-dvi: install-dvi-recursive
+
 install-exec-am: install-exec-local
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -667,27 +670,25 @@
 
 ps-am:
 
-uninstall-am: uninstall-dtdSCRIPTS uninstall-info-am
+uninstall-am: uninstall-dtdSCRIPTS
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
-	install-data install-data-am install-data-recursive \
-	install-dtdSCRIPTS install-exec install-exec-am \
-	install-exec-local install-exec-recursive install-info \
-	install-info-am install-info-recursive install-man \
-	install-recursive install-strip installcheck installcheck-am \
-	installdirs installdirs-am installdirs-recursive \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-	uninstall uninstall-am uninstall-dtdSCRIPTS uninstall-info-am \
-	uninstall-info-recursive uninstall-recursive
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dtdSCRIPTS install-dvi install-dvi-am \
+	install-exec install-exec-am install-exec-local install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-dtdSCRIPTS
 
 
 crm.dtd: crm-1.0.dtd
--- a/crm/admin/Makefile.in
+++ b/crm/admin/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,13 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +32,139 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+hasbin_PROGRAMS = crmadmin$(EXEEXT) cibadmin$(EXEEXT) \
+	ccm_tool$(EXEEXT) crm_diff$(EXEEXT) crm_mon$(EXEEXT) \
+	iso8601$(EXEEXT) crm_master$(EXEEXT) crm_standby$(EXEEXT) \
+	crm_failcount$(EXEEXT) crm_attribute$(EXEEXT) \
+	crm_resource$(EXEEXT) crm_verify$(EXEEXT) crm_uuid$(EXEEXT)
+subdir = crm/admin
+DIST_COMMON = $(halib_PYTHON) $(noinst_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/crm_commands.py.in \
+	$(srcdir)/crm_primitive.py.in $(srcdir)/crm_sh.in \
+	$(srcdir)/crm_utils.py.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES = crm_primitive.py crm_sh crm_utils.py \
+	crm_commands.py
+am__installdirs = "$(DESTDIR)$(hasbindir)" "$(DESTDIR)$(hasbindir)" \
+	"$(DESTDIR)$(halibdir)"
+hasbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(hasbin_PROGRAMS)
+am_ccm_tool_OBJECTS = ccm_epoche.$(OBJEXT)
+ccm_tool_OBJECTS = $(am_ccm_tool_OBJECTS)
+am__DEPENDENCIES_1 =
+am__DEPENDENCIES_2 = $(top_builddir)/lib/clplumbing/libplumb.la \
+	$(top_builddir)/lib/crm/common/libcrmcommon.la \
+	$(top_builddir)/lib/crm/cib/libcib.la \
+	$(top_builddir)/lib/hbclient/libhbclient.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+ccm_tool_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	$(top_builddir)/membership/ccm/libccmclient.la
+am_cibadmin_OBJECTS = cibadmin.$(OBJEXT)
+cibadmin_OBJECTS = $(am_cibadmin_OBJECTS)
+cibadmin_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_crm_attribute_OBJECTS = crm_attribute.$(OBJEXT)
+crm_attribute_OBJECTS = $(am_crm_attribute_OBJECTS)
+crm_attribute_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_crm_diff_OBJECTS = xml_diff.$(OBJEXT)
+crm_diff_OBJECTS = $(am_crm_diff_OBJECTS)
+crm_diff_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_crm_failcount_OBJECTS = crm_attribute.$(OBJEXT)
+crm_failcount_OBJECTS = $(am_crm_failcount_OBJECTS)
+crm_failcount_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_crm_master_OBJECTS = crm_attribute.$(OBJEXT)
+crm_master_OBJECTS = $(am_crm_master_OBJECTS)
+crm_master_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_crm_mon_OBJECTS = crm_mon.$(OBJEXT)
+crm_mon_OBJECTS = $(am_crm_mon_OBJECTS)
+crm_mon_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	$(top_builddir)/lib/crm/pengine/libpe_status.la
+am_crm_resource_OBJECTS = crm_resource.$(OBJEXT)
+crm_resource_OBJECTS = $(am_crm_resource_OBJECTS)
+crm_resource_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	$(top_builddir)/lib/crm/pengine/libpe_status.la
+am_crm_standby_OBJECTS = crm_attribute.$(OBJEXT)
+crm_standby_OBJECTS = $(am_crm_standby_OBJECTS)
+crm_standby_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_crm_uuid_OBJECTS = crm_uuid.$(OBJEXT)
+crm_uuid_OBJECTS = $(am_crm_uuid_OBJECTS)
+crm_uuid_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(top_builddir)/lib/clplumbing/libplumb.la
+am_crm_verify_OBJECTS = crm_verify.$(OBJEXT)
+crm_verify_OBJECTS = $(am_crm_verify_OBJECTS)
+crm_verify_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	$(top_builddir)/lib/crm/pengine/libpe_status.la \
+	$(top_builddir)/crm/pengine/libpengine.la
+am_crmadmin_OBJECTS = crmadmin.$(OBJEXT)
+crmadmin_OBJECTS = $(am_crmadmin_OBJECTS)
+crmadmin_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	$(top_builddir)/lib/crm/pengine/libpe_status.la
+am_iso8601_OBJECTS = test.iso8601.$(OBJEXT)
+iso8601_OBJECTS = $(am_iso8601_OBJECTS)
+iso8601_DEPENDENCIES = $(am__DEPENDENCIES_2)
+hasbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(hasbin_SCRIPTS)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(ccm_tool_SOURCES) $(cibadmin_SOURCES) \
+	$(crm_attribute_SOURCES) $(crm_diff_SOURCES) \
+	$(crm_failcount_SOURCES) $(crm_master_SOURCES) \
+	$(crm_mon_SOURCES) $(crm_resource_SOURCES) \
+	$(crm_standby_SOURCES) $(crm_uuid_SOURCES) \
+	$(crm_verify_SOURCES) $(crmadmin_SOURCES) $(iso8601_SOURCES)
+DIST_SOURCES = $(ccm_tool_SOURCES) $(cibadmin_SOURCES) \
+	$(crm_attribute_SOURCES) $(crm_diff_SOURCES) \
+	$(crm_failcount_SOURCES) $(crm_master_SOURCES) \
+	$(crm_mon_SOURCES) $(crm_resource_SOURCES) \
+	$(crm_standby_SOURCES) $(crm_uuid_SOURCES) \
+	$(crm_verify_SOURCES) $(crmadmin_SOURCES) $(iso8601_SOURCES)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+halibPYTHON_INSTALL = $(INSTALL_DATA)
+py_compile = $(top_srcdir)/py-compile
+HEADERS = $(noinst_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +187,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +230,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +241,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +249,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +268,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +276,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +311,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +331,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +341,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +350,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +370,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +392,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +407,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # Copyright (C) 2004 Andrew Beekhof
@@ -359,17 +435,14 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include	\
 		-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl 	\
 		-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha	\
 		-I$(top_builddir) -I$(top_srcdir)
 
-
 halibdir = $(libdir)/@HB_PKG@
 hasbindir = $(sbindir)
 AM_CFLAGS = @CFLAGS@ $(CRM_DEBUG_FLAGS)
-
 COMMONLIBS = \
 		$(top_builddir)/lib/clplumbing/libplumb.la		\
 		$(top_builddir)/lib/crm/common/libcrmcommon.la		\
@@ -379,37 +452,25 @@
 		$(CURSESLIBS)						\
 		$(LIBRT)
 
-
 halib_PYTHON = crm_primitive.py crm_utils.py crm_commands.py
-hasbin_PROGRAMS = crmadmin cibadmin ccm_tool crm_diff crm_mon iso8601 \
-			crm_master crm_standby crm_failcount crm_attribute \
-			crm_resource crm_verify crm_uuid 
-
-
 hasbin_SCRIPTS = crm_sh
 
 #noinst_HEADERS		= config.h control.h crmd.h
 noinst_HEADERS = 
-
 crmadmin_SOURCES = crmadmin.c
 crmadmin_LDADD = $(COMMONLIBS) \
 			$(top_builddir)/lib/crm/pengine/libpe_status.la
 
-
 crm_uuid_SOURCES = crm_uuid.c
 crm_uuid_LDADD = $(GLIBLIB) $(top_builddir)/lib/clplumbing/libplumb.la
-
 cibadmin_SOURCES = cibadmin.c
 cibadmin_LDADD = $(COMMONLIBS)
-
 ccm_tool_SOURCES = ccm_epoche.c
 ccm_tool_LDADD = $(COMMONLIBS) \
 			  $(top_builddir)/membership/ccm/libccmclient.la
 
-
 crm_diff_SOURCES = xml_diff.c
 crm_diff_LDADD = $(COMMONLIBS)
-
 crm_mon_SOURCES = crm_mon.c
 crm_mon_LDADD = $(COMMONLIBS) \
 			$(top_builddir)/lib/crm/pengine/libpe_status.la
@@ -421,196 +482,72 @@
 			$(top_builddir)/lib/crm/pengine/libpe_status.la \
 			$(top_builddir)/crm/pengine/libpengine.la
 
-
 crm_master_SOURCES = crm_attribute.c
 crm_master_LDADD = $(COMMONLIBS)
-
 crm_standby_SOURCES = crm_attribute.c
 crm_standby_LDADD = $(COMMONLIBS)
-
 crm_attribute_SOURCES = crm_attribute.c
 crm_attribute_LDADD = $(COMMONLIBS)
-
 crm_failcount_SOURCES = crm_attribute.c
 crm_failcount_LDADD = $(COMMONLIBS)
-
 crm_resource_SOURCES = crm_resource.c
 crm_resource_LDADD = $(COMMONLIBS) \
 			$(top_builddir)/lib/crm/pengine/libpe_status.la
 
-
 iso8601_SOURCES = test.iso8601.c
 iso8601_LDADD = $(COMMONLIBS) 
-subdir = crm/admin
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES = crm_primitive.py crm_sh crm_utils.py \
-	crm_commands.py
-hasbin_PROGRAMS = crmadmin$(EXEEXT) cibadmin$(EXEEXT) ccm_tool$(EXEEXT) \
-	crm_diff$(EXEEXT) crm_mon$(EXEEXT) iso8601$(EXEEXT) \
-	crm_master$(EXEEXT) crm_standby$(EXEEXT) crm_failcount$(EXEEXT) \
-	crm_attribute$(EXEEXT) crm_resource$(EXEEXT) \
-	crm_verify$(EXEEXT) crm_uuid$(EXEEXT)
-PROGRAMS = $(hasbin_PROGRAMS)
-
-am_ccm_tool_OBJECTS = ccm_epoche.$(OBJEXT)
-ccm_tool_OBJECTS = $(am_ccm_tool_OBJECTS)
-ccm_tool_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/crm/common/libcrmcommon.la \
-	$(top_builddir)/lib/crm/cib/libcib.la \
-	$(top_builddir)/lib/hbclient/libhbclient.la \
-	$(top_builddir)/membership/ccm/libccmclient.la
-ccm_tool_LDFLAGS =
-am_cibadmin_OBJECTS = cibadmin.$(OBJEXT)
-cibadmin_OBJECTS = $(am_cibadmin_OBJECTS)
-cibadmin_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/crm/common/libcrmcommon.la \
-	$(top_builddir)/lib/crm/cib/libcib.la \
-	$(top_builddir)/lib/hbclient/libhbclient.la
-cibadmin_LDFLAGS =
-am_crm_attribute_OBJECTS = crm_attribute.$(OBJEXT)
-crm_attribute_OBJECTS = $(am_crm_attribute_OBJECTS)
-crm_attribute_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/crm/common/libcrmcommon.la \
-	$(top_builddir)/lib/crm/cib/libcib.la \
-	$(top_builddir)/lib/hbclient/libhbclient.la
-crm_attribute_LDFLAGS =
-am_crm_diff_OBJECTS = xml_diff.$(OBJEXT)
-crm_diff_OBJECTS = $(am_crm_diff_OBJECTS)
-crm_diff_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/crm/common/libcrmcommon.la \
-	$(top_builddir)/lib/crm/cib/libcib.la \
-	$(top_builddir)/lib/hbclient/libhbclient.la
-crm_diff_LDFLAGS =
-am_crm_failcount_OBJECTS = crm_attribute.$(OBJEXT)
-crm_failcount_OBJECTS = $(am_crm_failcount_OBJECTS)
-crm_failcount_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/crm/common/libcrmcommon.la \
-	$(top_builddir)/lib/crm/cib/libcib.la \
-	$(top_builddir)/lib/hbclient/libhbclient.la
-crm_failcount_LDFLAGS =
-am_crm_master_OBJECTS = crm_attribute.$(OBJEXT)
-crm_master_OBJECTS = $(am_crm_master_OBJECTS)
-crm_master_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/crm/common/libcrmcommon.la \
-	$(top_builddir)/lib/crm/cib/libcib.la \
-	$(top_builddir)/lib/hbclient/libhbclient.la
-crm_master_LDFLAGS =
-am_crm_mon_OBJECTS = crm_mon.$(OBJEXT)
-crm_mon_OBJECTS = $(am_crm_mon_OBJECTS)
-crm_mon_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/crm/common/libcrmcommon.la \
-	$(top_builddir)/lib/crm/cib/libcib.la \
-	$(top_builddir)/lib/hbclient/libhbclient.la \
-	$(top_builddir)/lib/crm/pengine/libpe_status.la
-crm_mon_LDFLAGS =
-am_crm_resource_OBJECTS = crm_resource.$(OBJEXT)
-crm_resource_OBJECTS = $(am_crm_resource_OBJECTS)
-crm_resource_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/crm/common/libcrmcommon.la \
-	$(top_builddir)/lib/crm/cib/libcib.la \
-	$(top_builddir)/lib/hbclient/libhbclient.la \
-	$(top_builddir)/lib/crm/pengine/libpe_status.la
-crm_resource_LDFLAGS =
-am_crm_standby_OBJECTS = crm_attribute.$(OBJEXT)
-crm_standby_OBJECTS = $(am_crm_standby_OBJECTS)
-crm_standby_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/crm/common/libcrmcommon.la \
-	$(top_builddir)/lib/crm/cib/libcib.la \
-	$(top_builddir)/lib/hbclient/libhbclient.la
-crm_standby_LDFLAGS =
-am_crm_uuid_OBJECTS = crm_uuid.$(OBJEXT)
-crm_uuid_OBJECTS = $(am_crm_uuid_OBJECTS)
-crm_uuid_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la
-crm_uuid_LDFLAGS =
-am_crm_verify_OBJECTS = crm_verify.$(OBJEXT)
-crm_verify_OBJECTS = $(am_crm_verify_OBJECTS)
-crm_verify_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/crm/common/libcrmcommon.la \
-	$(top_builddir)/lib/crm/cib/libcib.la \
-	$(top_builddir)/lib/hbclient/libhbclient.la \
-	$(top_builddir)/lib/crm/pengine/libpe_status.la \
-	$(top_builddir)/crm/pengine/libpengine.la
-crm_verify_LDFLAGS =
-am_crmadmin_OBJECTS = crmadmin.$(OBJEXT)
-crmadmin_OBJECTS = $(am_crmadmin_OBJECTS)
-crmadmin_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/crm/common/libcrmcommon.la \
-	$(top_builddir)/lib/crm/cib/libcib.la \
-	$(top_builddir)/lib/hbclient/libhbclient.la \
-	$(top_builddir)/lib/crm/pengine/libpe_status.la
-crmadmin_LDFLAGS =
-am_iso8601_OBJECTS = test.iso8601.$(OBJEXT)
-iso8601_OBJECTS = $(am_iso8601_OBJECTS)
-iso8601_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/crm/common/libcrmcommon.la \
-	$(top_builddir)/lib/crm/cib/libcib.la \
-	$(top_builddir)/lib/hbclient/libhbclient.la
-iso8601_LDFLAGS =
-SCRIPTS = $(hasbin_SCRIPTS)
-
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ccm_epoche.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/cibadmin.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/crm_attribute.Po ./$(DEPDIR)/crm_mon.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/crm_resource.Po ./$(DEPDIR)/crm_uuid.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/crm_verify.Po ./$(DEPDIR)/crmadmin.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/test.iso8601.Po ./$(DEPDIR)/xml_diff.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(ccm_tool_SOURCES) $(cibadmin_SOURCES) \
-	$(crm_attribute_SOURCES) $(crm_diff_SOURCES) \
-	$(crm_failcount_SOURCES) $(crm_master_SOURCES) \
-	$(crm_mon_SOURCES) $(crm_resource_SOURCES) \
-	$(crm_standby_SOURCES) $(crm_uuid_SOURCES) \
-	$(crm_verify_SOURCES) $(crmadmin_SOURCES) $(iso8601_SOURCES)
-py_compile = $(top_srcdir)/py-compile
-HEADERS = $(noinst_HEADERS)
-
-DIST_COMMON = $(halib_PYTHON) $(noinst_HEADERS) $(srcdir)/Makefile.in \
-	Makefile.am crm_commands.py.in crm_primitive.py.in crm_sh.in \
-	crm_utils.py.in
-SOURCES = $(ccm_tool_SOURCES) $(cibadmin_SOURCES) $(crm_attribute_SOURCES) $(crm_diff_SOURCES) $(crm_failcount_SOURCES) $(crm_master_SOURCES) $(crm_mon_SOURCES) $(crm_resource_SOURCES) $(crm_standby_SOURCES) $(crm_uuid_SOURCES) $(crm_verify_SOURCES) $(crmadmin_SOURCES) $(iso8601_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  crm/admin/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  crm/admin/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-crm_primitive.py: $(top_builddir)/config.status crm_primitive.py.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+crm_primitive.py: $(top_builddir)/config.status $(srcdir)/crm_primitive.py.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-crm_sh: $(top_builddir)/config.status crm_sh.in
+crm_sh: $(top_builddir)/config.status $(srcdir)/crm_sh.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-crm_utils.py: $(top_builddir)/config.status crm_utils.py.in
+crm_utils.py: $(top_builddir)/config.status $(srcdir)/crm_utils.py.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-crm_commands.py: $(top_builddir)/config.status crm_commands.py.in
+crm_commands.py: $(top_builddir)/config.status $(srcdir)/crm_commands.py.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-hasbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-hasbinPROGRAMS: $(hasbin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(hasbindir)
+	test -z "$(hasbindir)" || $(MKDIR_P) "$(DESTDIR)$(hasbindir)"
 	@list='$(hasbin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(hasbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(hasbindir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(hasbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(hasbindir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(hasbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(hasbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(hasbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(hasbindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -618,8 +555,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(hasbin_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(hasbindir)/$$f"; \
-	  rm -f $(DESTDIR)$(hasbindir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(hasbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(hasbindir)/$$f"; \
 	done
 
 clean-hasbinPROGRAMS:
@@ -630,53 +567,52 @@
 	done
 ccm_tool$(EXEEXT): $(ccm_tool_OBJECTS) $(ccm_tool_DEPENDENCIES) 
 	@rm -f ccm_tool$(EXEEXT)
-	$(LINK) $(ccm_tool_LDFLAGS) $(ccm_tool_OBJECTS) $(ccm_tool_LDADD) $(LIBS)
+	$(LINK) $(ccm_tool_OBJECTS) $(ccm_tool_LDADD) $(LIBS)
 cibadmin$(EXEEXT): $(cibadmin_OBJECTS) $(cibadmin_DEPENDENCIES) 
 	@rm -f cibadmin$(EXEEXT)
-	$(LINK) $(cibadmin_LDFLAGS) $(cibadmin_OBJECTS) $(cibadmin_LDADD) $(LIBS)
+	$(LINK) $(cibadmin_OBJECTS) $(cibadmin_LDADD) $(LIBS)
 crm_attribute$(EXEEXT): $(crm_attribute_OBJECTS) $(crm_attribute_DEPENDENCIES) 
 	@rm -f crm_attribute$(EXEEXT)
-	$(LINK) $(crm_attribute_LDFLAGS) $(crm_attribute_OBJECTS) $(crm_attribute_LDADD) $(LIBS)
+	$(LINK) $(crm_attribute_OBJECTS) $(crm_attribute_LDADD) $(LIBS)
 crm_diff$(EXEEXT): $(crm_diff_OBJECTS) $(crm_diff_DEPENDENCIES) 
 	@rm -f crm_diff$(EXEEXT)
-	$(LINK) $(crm_diff_LDFLAGS) $(crm_diff_OBJECTS) $(crm_diff_LDADD) $(LIBS)
+	$(LINK) $(crm_diff_OBJECTS) $(crm_diff_LDADD) $(LIBS)
 crm_failcount$(EXEEXT): $(crm_failcount_OBJECTS) $(crm_failcount_DEPENDENCIES) 
 	@rm -f crm_failcount$(EXEEXT)
-	$(LINK) $(crm_failcount_LDFLAGS) $(crm_failcount_OBJECTS) $(crm_failcount_LDADD) $(LIBS)
+	$(LINK) $(crm_failcount_OBJECTS) $(crm_failcount_LDADD) $(LIBS)
 crm_master$(EXEEXT): $(crm_master_OBJECTS) $(crm_master_DEPENDENCIES) 
 	@rm -f crm_master$(EXEEXT)
-	$(LINK) $(crm_master_LDFLAGS) $(crm_master_OBJECTS) $(crm_master_LDADD) $(LIBS)
+	$(LINK) $(crm_master_OBJECTS) $(crm_master_LDADD) $(LIBS)
 crm_mon$(EXEEXT): $(crm_mon_OBJECTS) $(crm_mon_DEPENDENCIES) 
 	@rm -f crm_mon$(EXEEXT)
-	$(LINK) $(crm_mon_LDFLAGS) $(crm_mon_OBJECTS) $(crm_mon_LDADD) $(LIBS)
+	$(LINK) $(crm_mon_OBJECTS) $(crm_mon_LDADD) $(LIBS)
 crm_resource$(EXEEXT): $(crm_resource_OBJECTS) $(crm_resource_DEPENDENCIES) 
 	@rm -f crm_resource$(EXEEXT)
-	$(LINK) $(crm_resource_LDFLAGS) $(crm_resource_OBJECTS) $(crm_resource_LDADD) $(LIBS)
+	$(LINK) $(crm_resource_OBJECTS) $(crm_resource_LDADD) $(LIBS)
 crm_standby$(EXEEXT): $(crm_standby_OBJECTS) $(crm_standby_DEPENDENCIES) 
 	@rm -f crm_standby$(EXEEXT)
-	$(LINK) $(crm_standby_LDFLAGS) $(crm_standby_OBJECTS) $(crm_standby_LDADD) $(LIBS)
+	$(LINK) $(crm_standby_OBJECTS) $(crm_standby_LDADD) $(LIBS)
 crm_uuid$(EXEEXT): $(crm_uuid_OBJECTS) $(crm_uuid_DEPENDENCIES) 
 	@rm -f crm_uuid$(EXEEXT)
-	$(LINK) $(crm_uuid_LDFLAGS) $(crm_uuid_OBJECTS) $(crm_uuid_LDADD) $(LIBS)
+	$(LINK) $(crm_uuid_OBJECTS) $(crm_uuid_LDADD) $(LIBS)
 crm_verify$(EXEEXT): $(crm_verify_OBJECTS) $(crm_verify_DEPENDENCIES) 
 	@rm -f crm_verify$(EXEEXT)
-	$(LINK) $(crm_verify_LDFLAGS) $(crm_verify_OBJECTS) $(crm_verify_LDADD) $(LIBS)
+	$(LINK) $(crm_verify_OBJECTS) $(crm_verify_LDADD) $(LIBS)
 crmadmin$(EXEEXT): $(crmadmin_OBJECTS) $(crmadmin_DEPENDENCIES) 
 	@rm -f crmadmin$(EXEEXT)
-	$(LINK) $(crmadmin_LDFLAGS) $(crmadmin_OBJECTS) $(crmadmin_LDADD) $(LIBS)
+	$(LINK) $(crmadmin_OBJECTS) $(crmadmin_LDADD) $(LIBS)
 iso8601$(EXEEXT): $(iso8601_OBJECTS) $(iso8601_DEPENDENCIES) 
 	@rm -f iso8601$(EXEEXT)
-	$(LINK) $(iso8601_LDFLAGS) $(iso8601_OBJECTS) $(iso8601_LDADD) $(LIBS)
-hasbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+	$(LINK) $(iso8601_OBJECTS) $(iso8601_LDADD) $(LIBS)
 install-hasbinSCRIPTS: $(hasbin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(hasbindir)
+	test -z "$(hasbindir)" || $(MKDIR_P) "$(DESTDIR)$(hasbindir)"
 	@list='$(hasbin_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(hasbinSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(hasbindir)/$$f"; \
-	    $(hasbinSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(hasbindir)/$$f; \
+	    echo " $(hasbinSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(hasbindir)/$$f'"; \
+	    $(hasbinSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(hasbindir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -684,12 +620,12 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(hasbin_SCRIPTS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f $(DESTDIR)$(hasbindir)/$$f"; \
-	  rm -f $(DESTDIR)$(hasbindir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(hasbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(hasbindir)/$$f"; \
 	done
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -706,79 +642,60 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml_diff.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-halibPYTHON_INSTALL = $(INSTALL_DATA)
 install-halibPYTHON: $(halib_PYTHON)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	test -z "$(halibdir)" || $(MKDIR_P) "$(DESTDIR)$(halibdir)"
 	@list='$(halib_PYTHON)'; dlist=''; for p in $$list; do\
 	  if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
 	  if test -f $$b$$p; then \
-	    d=`echo "$$p" | sed -e 's,^.*/,,'`; \
-	    dlist="$$dlist $$d"; \
-	    echo " $(halibPYTHON_INSTALL) $$b$$p $(DESTDIR)$(halibdir)/$$d"; \
-	    $(halibPYTHON_INSTALL) $$b$$p $(DESTDIR)$(halibdir)/$$d; \
+	    f=$(am__strip_dir) \
+	    dlist="$$dlist $$f"; \
+	    echo " $(halibPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	    $(halibPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(halibdir)/$$f"; \
 	  else :; fi; \
 	done; \
-	PYTHON=$(PYTHON) $(py_compile) --basedir $(DESTDIR)$(halibdir) $$dlist
+	if test -n "$$dlist"; then \
+	  if test -z "$(DESTDIR)"; then \
+	    PYTHON=$(PYTHON) $(py_compile) --basedir "$(halibdir)" $$dlist; \
+	  else \
+	    PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(halibdir)" $$dlist; \
+	  fi; \
+	else :; fi
 
 uninstall-halibPYTHON:
 	@$(NORMAL_UNINSTALL)
-	list='$(halib_PYTHON)'; for p in $$list; do \
-	  d=`echo "$$p" | sed -e 's,^.*/,,'`; \
-	  rm -f $(DESTDIR)$(halibdir)/$$d; \
-	  rm -f $(DESTDIR)$(halibdir)/$${d}c; \
-	  rm -f $(DESTDIR)$(halibdir)/$${d}o; \
+	@list='$(halib_PYTHON)'; dlist=''; for p in $$list; do\
+	  f=$(am__strip_dir) \
+	  rm -f "$(DESTDIR)$(halibdir)/$$f"; \
+	  rm -f "$(DESTDIR)$(halibdir)/$${f}c"; \
+	  rm -f "$(DESTDIR)$(halibdir)/$${f}o"; \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -787,6 +704,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -798,10 +716,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -824,28 +743,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -859,9 +773,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(HEADERS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(hasbindir) $(DESTDIR)$(hasbindir) $(DESTDIR)$(halibdir)
+	for dir in "$(DESTDIR)$(hasbindir)" "$(DESTDIR)$(hasbindir)" "$(DESTDIR)$(halibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -879,7 +794,7 @@
 mostlyclean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -894,12 +809,14 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -907,12 +824,20 @@
 install-data-am: install-halibPYTHON install-hasbinPROGRAMS \
 	install-hasbinSCRIPTS
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-exec-local
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -934,22 +859,26 @@
 ps-am:
 
 uninstall-am: uninstall-halibPYTHON uninstall-hasbinPROGRAMS \
-	uninstall-hasbinSCRIPTS uninstall-info-am uninstall-local
+	uninstall-hasbinSCRIPTS uninstall-local
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-hasbinPROGRAMS clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-exec-local install-halibPYTHON \
-	install-hasbinPROGRAMS install-hasbinSCRIPTS install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-exec-local \
+	install-halibPYTHON install-hasbinPROGRAMS \
+	install-hasbinSCRIPTS install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-halibPYTHON \
 	uninstall-hasbinPROGRAMS uninstall-hasbinSCRIPTS \
-	uninstall-info-am uninstall-local
+	uninstall-local
 
 
 clean-generic:
--- a/crm/cib/Makefile.in
+++ b/crm/cib/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,12 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +31,76 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+halib_PROGRAMS = cib$(EXEEXT) cibmon$(EXEEXT)
+subdir = crm/cib
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(halibdir)"
+halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(halib_PROGRAMS)
+am_cib_OBJECTS = io.$(OBJEXT) primatives.$(OBJEXT) messages.$(OBJEXT) \
+	cib.$(OBJEXT) notify.$(OBJEXT) callbacks.$(OBJEXT) \
+	main.$(OBJEXT) remote.$(OBJEXT)
+cib_OBJECTS = $(am_cib_OBJECTS)
+am__DEPENDENCIES_1 =
+am__DEPENDENCIES_2 = $(top_builddir)/lib/clplumbing/libplumb.la \
+	$(top_builddir)/lib/crm/common/libcrmcommon.la \
+	$(top_builddir)/lib/hbclient/libhbclient.la \
+	$(top_builddir)/lib/crm/cib/libcib.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+cib_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
+	$(top_builddir)/membership/ccm/libccmclient.la
+cib_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(cib_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_cibmon_OBJECTS = cibmon.$(OBJEXT)
+cibmon_OBJECTS = $(am_cibmon_OBJECTS)
+cibmon_DEPENDENCIES = $(am__DEPENDENCIES_2)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(cib_SOURCES) $(cibmon_SOURCES)
+DIST_SOURCES = $(cib_SOURCES) $(cibmon_SOURCES)
+HEADERS = $(noinst_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +123,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +166,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +177,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +185,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -173,14 +199,11 @@
 LIBNETDEFINES = @LIBNETDEFINES@
 LIBNETLIBS = @LIBNETLIBS@
 LIBOBJS = @LIBOBJS@
-
 LIBRT = @LIBRT@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -189,15 +212,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -227,8 +247,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -249,8 +267,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -261,20 +277,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -282,17 +286,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -300,6 +306,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -321,6 +328,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -335,12 +343,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # Copyright (C) 2004 Andrew Beekhof
@@ -360,15 +371,12 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include  -I$(top_srcdir)/include  \
 		  -I$(top_builddir)/libltdl  -I$(top_srcdir)/libltdl  \
 		  -I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
 		  -I$(top_builddir)          -I$(top_srcdir)
 
-
 EXTRA_DIST = cib.pam
-
 hadir = $(sysconfdir)/ha.d
 halibdir = $(libdir)/@HB_PKG@
 commmoddir = $(halibdir)/modules/comm
@@ -380,7 +388,6 @@
 crmuid = @HA_CCMUID@
 crmreqsocket = $(havarlibdir)/api/crm.req
 crmressocket = $(havarlibdir)/api/crm.rsp
-
 COMMONLIBS = \
 		  $(top_builddir)/lib/clplumbing/libplumb.la		\
 		  $(top_builddir)/lib/crm/common/libcrmcommon.la	\
@@ -391,92 +398,63 @@
 
 AM_CFLAGS = @CFLAGS@ $(CRM_DEBUG_FLAGS)
 
-halib_PROGRAMS = cib cibmon
-
 #noinst_HEADERS		= config.h control.h crmd.h
 noinst_HEADERS = cibio.h cibmessages.h cibprimatives.h notify.h \
 			callbacks.h
 
-
 cib_SOURCES = io.c primatives.c messages.c cib.c notify.c \
 			callbacks.c main.c remote.c
 
 cib_LDADD = $(COMMONLIBS) $(CRYPTOLIB) \
 			$(top_builddir)/membership/ccm/libccmclient.la
 
-
 cib_LDFLAGS = $(GNUTLSLIBS)
-
 cibmon_SOURCES = cibmon.c
 cibmon_LDADD = $(COMMONLIBS)
-subdir = crm/cib
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-halib_PROGRAMS = cib$(EXEEXT) cibmon$(EXEEXT)
-PROGRAMS = $(halib_PROGRAMS)
-
-am_cib_OBJECTS = io.$(OBJEXT) primatives.$(OBJEXT) messages.$(OBJEXT) \
-	cib.$(OBJEXT) notify.$(OBJEXT) callbacks.$(OBJEXT) \
-	main.$(OBJEXT) remote.$(OBJEXT)
-cib_OBJECTS = $(am_cib_OBJECTS)
-cib_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/crm/common/libcrmcommon.la \
-	$(top_builddir)/lib/hbclient/libhbclient.la \
-	$(top_builddir)/lib/crm/cib/libcib.la \
-	$(top_builddir)/membership/ccm/libccmclient.la
-am_cibmon_OBJECTS = cibmon.$(OBJEXT)
-cibmon_OBJECTS = $(am_cibmon_OBJECTS)
-cibmon_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/crm/common/libcrmcommon.la \
-	$(top_builddir)/lib/hbclient/libhbclient.la \
-	$(top_builddir)/lib/crm/cib/libcib.la
-cibmon_LDFLAGS =
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/callbacks.Po ./$(DEPDIR)/cib.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/cibmon.Po ./$(DEPDIR)/io.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/main.Po ./$(DEPDIR)/messages.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/notify.Po ./$(DEPDIR)/primatives.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/remote.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(cib_SOURCES) $(cibmon_SOURCES)
-HEADERS = $(noinst_HEADERS)
-
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(cib_SOURCES) $(cibmon_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  crm/cib/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  crm/cib/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-halibPROGRAMS: $(halib_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	test -z "$(halibdir)" || $(MKDIR_P) "$(DESTDIR)$(halibdir)"
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -484,8 +462,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(halibdir)/$$f"; \
-	  rm -f $(DESTDIR)$(halibdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(halibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(halibdir)/$$f"; \
 	done
 
 clean-halibPROGRAMS:
@@ -496,13 +474,13 @@
 	done
 cib$(EXEEXT): $(cib_OBJECTS) $(cib_DEPENDENCIES) 
 	@rm -f cib$(EXEEXT)
-	$(LINK) $(cib_LDFLAGS) $(cib_OBJECTS) $(cib_LDADD) $(LIBS)
+	$(cib_LINK) $(cib_OBJECTS) $(cib_LDADD) $(LIBS)
 cibmon$(EXEEXT): $(cibmon_OBJECTS) $(cibmon_DEPENDENCIES) 
 	@rm -f cibmon$(EXEEXT)
-	$(LINK) $(cibmon_LDFLAGS) $(cibmon_OBJECTS) $(cibmon_LDADD) $(LIBS)
+	$(LINK) $(cibmon_OBJECTS) $(cibmon_LDADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -518,37 +496,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -556,18 +522,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -576,6 +530,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -587,10 +542,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -613,28 +569,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -648,9 +599,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(HEADERS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	for dir in "$(DESTDIR)$(halibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -668,7 +620,7 @@
 mostlyclean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -676,30 +628,41 @@
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
-clean-am: clean-generic clean-halibPROGRAMS clean-libtool mostlyclean-am
+clean-am: clean-generic clean-halibPROGRAMS clean-libtool \
+	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-halibPROGRAMS
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-exec-local
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -720,20 +683,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-halibPROGRAMS uninstall-info-am uninstall-local
+uninstall-am: uninstall-halibPROGRAMS uninstall-local
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-halibPROGRAMS clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-exec-local install-halibPROGRAMS \
-	install-info install-info-am install-man install-strip \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-exec-local \
+	install-halibPROGRAMS install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-halibPROGRAMS \
-	uninstall-info-am uninstall-local
+	uninstall-local
 
 
 clean-generic:
--- /dev/null
+++ b/crm/crm.dtd
@@ -0,0 +1,853 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+GLOBAL TODOs:
+
+Versionize DTD so we can validate against a specific version
+
+Background
+ The CIB is described quite well in section 5 of the crm.txt (checked into CVS in the crm directory) so it is not repeated here.
+ Suffice to say that it stores the configuration and runtime data required for cluster-wide resource management in XML format.
+
+CIB: Information Structure
+ The CIB is divided into two main sections: The "static" configuration part and the "dynamic" status.
+
+ The configuration contains - surprisingly - the configuration of the cluster, namely node attributes, resource instance configuration, and the constraints which describe the dependencies between all these.
+ To identify the most recent configuration available in the cluster, this section is time-stamped with the unique timestamp of the last update.
+
+ The status part is dynamically generated / updated by the CRM system and represents the current status of the cluster; which nodes are up, down or crashed, which resources are running where etc.
+
+ Every information carrying object has an "id" tag, which is basically the UUID of it, should we ever need to access it directly.
+ Unless otherwise stated, the id field is a short name consisting simple ascii characters [a-zA-Z0-9_\-]
+ The exception is for resources because the LRM can support only id's of up to 64 characters.
+
+Other Notes
+ The description field in all elements is opaque to the CRM and is for administrative comments.
+
+TODO
+ * Figure out a sane way to version the DTD
+ * Do we need to know about ping nodes...?
+ * The integer comparison type really should be number
+-->
+<!ELEMENT cib (configuration, status)>
+<!ATTLIST cib
+          cib-last-written CDATA        #IMPLIED
+
+          admin_epoch  CDATA        #REQUIRED
+          epoch        CDATA        #REQUIRED
+          num_updates  CDATA        #REQUIRED
+          num_peers    CDATA        #IMPLIED        
+
+          cib_feature_revision  CDATA   #IMPLIED
+          crm_feature_set       CDATA   #IMPLIED
+          remote_access_port    CDATA   #IMPLIED        
+
+          dc_uuid        CDATA             #IMPLIED
+          ccm_transition CDATA             #IMPLIED
+          have_quorum    (true|yes|1|false|no|0)  'false'
+          ignore_dtd     (true|yes|1|false|no|0)  #IMPLIED
+
+          generated    CDATA    #IMPLIED        
+          crm-debug-origin CDATA    #IMPLIED>
+
+<!--
+The CIB's version is a tuple of admin_epoch, epoch and num_updates (in that order).
+
+This is used when applying updates from the master CIB instance.
+
+Additionally, num_peers and have_quorum are used during the election process to determin who has the latest configuration.
+ * num_updates is incremented every time the CIB changes.
+ * epoch is incremented after every DC election.
+ * admin_epoch is exclusivly for the admin to change.
+ * num_peers is the number of CIB instances that we can talk to
+ * have_quorum is derived from the ConsensusClusterMembership layer
+ * dc_uuid stored the UUID of the current DesignatedController
+ * ccm_transition stores the membership instance from the ConsensusClusterMembership layer.
+ * cib_feature_revision is the feature set that this configuration requires
+-->
+<!ELEMENT configuration (crm_config, nodes, resources, constraints)>
+
+<!--
+crm_config
+
+Used to specify cluster-wide options.
+
+The use of multiple cluster_property_set sections and time-based rule expressions allows the the cluster to behave differently (for example) during buisness hours than it does overnight.
+-->
+<!ELEMENT crm_config (cluster_property_set)*>
+
+<!--
+Current crm_config options:
+
+ * transition_idle_timeout (interval, default=60s):
+   If no activity is recorded in this time, the transition is deemed failed as are all sent actions that have not yet been confirmed complete.
+   If any operation initiated has an explicit higher timeout, the higher value applies.
+
+ * symmetric_cluster (boolean, default=TRUE):
+   If true, resources are permitted to run anywhere by default.
+   Otherwise, explicit constraints must be created to specify where they can run.
+
+ * stonith_enabled (boolean, default=FALSE):
+   If true, failed nodes will be fenced.
+
+ * no_quorum_policy (enum, default=stop)
+   * ignore - Pretend we have quorum
+   * freeze - Do not start any resources not currently in our partition.
+     Resources in our partition may be moved to another node within the partition
+     Fencing is disabled
+   * stop - Stop all running resources in our partition
+     Fencing is disabled
+
+ * default_resource_stickiness
+   Do we prefer to run on the existing node or be moved to a "better" one?
+   * 0 : resources will be placed optimally in the system.
+     This may mean they are moved when a "better" or less loaded node becomes available.
+     This option is almost equivalent to auto_failback on except that the resource may be moved to other nodes than the one it was previously active on.
+   * value > 0 : resources will prefer to remain in their current location but may be moved if a more suitable node is available.
+     Higher values indicate a stronger preference for resources to stay where they are.
+   * value < 0 : resources prefer to move away from their current location.
+     Higher absolute values indicate a stronger preference for resources to be moved.
+   * INFINITY : resources will always remain in their current locations until forced off because the node is no longer eligible to run the resource (node shutdown, node standby or configuration change).
+     This option is almost equivalent to auto_failback off except that the resource may be moved to other nodes than the one it was previously active on.
+   * -INFINITY : resources will always move away from their current location.
+
+ * is_managed_default (boolean, default=TRUE)
+   Unless the resource's definition says otherwise,
+   * TRUE : resources will be started, stopped, monitored and moved as necessary/required
+   * FALSE : resources will not started if stopped, stopped if started nor have any recurring actions scheduled.
+
+ * stop_orphan_resources (boolean, default=TRUE (as of release 2.0.6))
+   If a resource is found for which we have no definition for;
+   * TRUE : Stop the resource
+   * FALSE : Ignore the resource
+   This mostly effects the CRM's behavior when a resource is deleted by an admin without it first being stopped.
+
+ * stop_orphan_actions (boolean, default=TRUE)
+   If a recurring action is found for which we have no definition for;
+   * TRUE : Stop the action
+   * FALSE : Ignore the action
+   This mostly effects the CRM's behavior when the interval for a recurring action is changed.
+-->
+<!ELEMENT cluster_property_set (rule*, attributes)>
+<!ATTLIST cluster_property_set
+          id                CDATA        #REQUIRED
+          score             CDATA        #IMPLIED>
+
+<!ELEMENT nodes       (node*)>
+
+<!--
+ * id    : the node's UUID.
+ * uname : the result of uname -n
+ * type  : should either be "normal" or "member" for nodes you with to run resources 
+   "normal" is preferred as of version 2.0.4
+
+Each node can also have additional "instance" attributes.
+These attributes are completely arbitrary and can be used later in constraints.
+In this way it is possible to define groups of nodes to which a constraint can apply.
+
+It is also theoretically possible to have a process on each node which updates these values automatically.
+This would make it possible to have an attribute that represents "connected to SAN subsystem" or perhaps "system_load (low|medium|high)".
+
+Ideally it would be possible to have the CRMd on each node gather some of this information and automatically populate things like architecture and OS/kernel version.
+-->
+<!ELEMENT node (instance_attributes*)>
+<!ATTLIST node
+          id            CDATA         #REQUIRED
+          uname         CDATA         #REQUIRED
+          description   CDATA         #IMPLIED
+          type          (normal|member|ping) #REQUIRED>
+
+<!ELEMENT resources   (primitive|group|clone|master_slave)*>
+
+<!--
+ * class
+   Specifies the location and standard the resource script conforms to
+   * ocf
+     Most OCF RAs started out life as v1 Heartbeat resource agents.
+     These have all been ported to meet the OCF specifications.
+     As an added advantage, in accordance with the OCF spec, they also describe the parameters they take and what their defaults are.
+     It is also easier to configure them as each part of the configuration is passed as its own parameter.
+     In accordance with the OCF spec, each parameter is passed to the RA with an OCF_RESKEY_ prefix.
+     So ip=192.168.1.1 in the CIB would be passed as OCF_RESKEY_ip=192.168.1.1.
+     Located under /usr/lib/ocf/resource.d/heartbeat/.
+   * lsb
+     Most Linux init scripts conform to the LSB specification.
+     The class allows you to use those that do as resource agents controlled by Heartbeat.
+     Located in /etc/init.d/.
+   * heartbeat
+     This class gives you access to the v1 Heartbeat resource agents and allows you to reuse any custom agents you may have written.
+     Located at /etc/heartbeat/resource.d/ or /etc/ha.d/resource.d.
+
+ * type : The name of the ResourceAgent you wish to use.
+
+ * provider
+   The OCF spec allows multiple vendors to supply the same ResourceAgent.
+   To use the OCF resource agents supplied with Heartbeat, you should specify heartbeat here
+
+ * is_managed : Is the ClusterResourceManager in control of this resource.
+   * true : (default) the resource will be started, stopped, monitored and moved as necessary/required
+   * false : the resource will not started if stopped, stopped if started nor have any recurring actions scheduled.
+     The resource may still be referenced in colocation constraints and ordering constraints (though obviously if no actions are performed on it then it will prevent the action on the other resource too)
+
+ * restart_type
+   Used when the other side of an ordering dependency is restarted/moved.
+   * ignore : the default.
+     Don't do anything extra.
+   * restart
+     Use this for example to have a restart of your database also trigger a restart of your web-server.
+   * multiple_active
+     Used when a resource is detected as being active on more than one machine.
+     The default value, stop_start, will stop all instances and start only 1
+   * block : don't do anything, wait for the administrator
+   * stop_only : stop all the active instances
+   * stop_start : start the resource on one node after having stopped all the active instances
+
+ * resource_stickiness
+   See the description of the default_resource_stickiness cluster attribute.
+   resource_stickiness allows you to override the cluster's default for the individual resource.
+
+NOTE: primitive resources may contain at most one "operations" object.
+      The CRM will complain about your configuration if this criteria is not met.
+      Please use crm_verify to ensure your configuration is valid.
+      The DTD is written this way to be order in-sensitive.
+-->
+<!ELEMENT primitive (operations|meta_attributes|instance_attributes)*>
+<!ATTLIST primitive
+          id                CDATA        #REQUIRED
+          description       CDATA        #IMPLIED
+          class             (ocf|lsb|heartbeat|stonith) #REQUIRED
+          type              CDATA        #REQUIRED
+          provider          CDATA        #IMPLIED
+
+          is_managed            CDATA                            #IMPLIED
+          restart_type          (ignore|restart)                 'ignore'
+          multiple_active       (stop_start|stop_only|block)     'stop_start'
+          resource_stickiness   CDATA                             #IMPLIED>
+<!--
+This allows us to specify how long an action can take
+
+ * name : the name of the operation.
+   Supported operations are start, stop, & monitor
+
+ * start_delay : delay the operation after starting the resource
+   By default this value is in milliseconds, however you can also specify a value in seconds like so timeout="5s". Used for the monitor operation.
+
+ * timeout : the maximum period of time before considering the action failed.
+   By default this value is in milliseconds, however you can also specify a value in seconds like so timeout="5s".
+
+ * interval : This currently only applies to monitor operations and specifies how often the LRM should check the resource is active.
+   The same notation for timeout applies.
+
+ * prereq : What conditions need to be met before this action can be run
+   * nothing : This action can be performed at any time
+   * quorum : This action requires the partition to have quorum
+   * fencing : This action requires the partition to have quorum and any fencing operations to have completed before it can be executed
+
+ * on_fail : The action to take if this action ever fails.
+   * nothing : Pretend the action didnt actually fail
+   * block : Take no further action on the resource - wait for the administrator to resolve the issue
+   * restart : Stop the resource and re-allocate it elsewhere
+   * stop : Stop the resource and DO NOT re-allocate it elsewhere
+   * fence : Currently this means fence the node on which the resource is running.
+     Any other resources currently active on the machine will be migrated away before fencing occurs.
+
+Only one entry per supported action+interval is currently permitted.
+Parameters specific to each operation can be passed using the instance_attributes section.
+-->
+<!ELEMENT operations (op*)>
+<!ELEMENT op (meta_attributes|instance_attributes)*>
+<!ATTLIST op
+          id            CDATA         #REQUIRED
+          name          CDATA         #REQUIRED
+          description   CDATA         #IMPLIED
+          interval      CDATA         #IMPLIED
+          timeout       CDATA         #IMPLIED
+          start_delay   CDATA         '0'
+          disabled      (true|yes|1|false|no|0)        'false'
+          role          (Master|Slave|Started|Stopped) 'Started'
+          prereq        (nothing|quorum|fencing)       #IMPLIED
+          on_fail       (ignore|block|stop|restart|fence)     #IMPLIED>
+<!--
+Use this to emulate v1 type Heartbeat groups.
+Defining a resource group is a quick way to make sure that the resources:
+ * are all started on the same node, and
+ * are started and stopped in the correct (sequential) order
+though either or both of these properties can be disabled.
+
+NOTE: Do not create empty groups.  
+      They are temporarily supported because the GUI requires it but will be removed as soon as possible.
+      The DTD is written this way to be order in-sensitive.
+-->
+<!ELEMENT group (meta_attributes|instance_attributes|primitive)*>
+<!ATTLIST group
+          id            CDATA               #REQUIRED
+          description   CDATA               #IMPLIED
+
+          is_managed            CDATA                         #IMPLIED
+          restart_type          (ignore|restart)              'ignore'
+          multiple_active       (stop_start|stop_only|block)  'stop_start'
+          resource_stickiness   CDATA			      #IMPLIED
+
+          ordered               (true|yes|1|false|no|0)       'true'
+          collocated            (true|yes|1|false|no|0)       'true'>
+<!--
+Clones are intended as a mechanism for easily starting a number of resources (such as a web-server) with the same configuration.
+As an added benefit, the number that should be started is an instance parameter and when combined with time-based constraints, allows the administrator to run more instances during peak times and save on resources during idle periods.
+
+ * ordered
+   Start (or stop) each clone only after the operation on the previous clone completed.
+
+ * interleaved
+   If a colocation constraint is created between two clone resources and interleaved is true, then clone N from one resource will be assigned the same location as clone N from the other resource.
+   If the number of runnable clones differs, then the leftovers can be located anywhere.
+Using a cloned group is a much better way of achieving the same result.
+
+ * notify
+   If true, inform peers before and after any clone is stopped or started.
+   If an action failed, you will (currently) not recieve a post-notification.
+   Instead you can next expect to see a pre-notification for a stop.
+   If a stop fails, and you have fencing you will get a post-notification for the stop after the fencing operation has completed.
+   In order to use the notification service ALL decendants of the clone MUST support the notify action.
+   Currently this action is not permitted to fail, though depending on your configuration, can block almost indefinitly.
+   Behaviour in response to a failed action or notificaiton is likely to be improved in future releases.
+
+   See http://linux-ha.org/v2/Concepts/Clones for more information on notify actions
+
+
+NOTE: Clones must contain exactly one primitive or one group resource. 
+      The CRM will complain about your configuration if this criteria is not met.
+      Please use crm_verify to ensure your configuration is valid.
+      The DTD is written this way to be order in-sensitive.
+-->
+
+<!ELEMENT clone (meta_attributes|instance_attributes|primitive|group)*>
+<!ATTLIST clone
+          id            CDATA               #REQUIRED
+          description   CDATA               #IMPLIED
+
+          is_managed            CDATA                         #IMPLIED
+          restart_type          (ignore|restart)              'ignore'
+          multiple_active       (stop_start|stop_only|block)  'stop_start'
+          resource_stickiness   CDATA                         #IMPLIED
+
+          notify                (true|yes|1|false|no|0)       'false'
+          globally_unique       (true|yes|1|false|no|0)       'true'
+          ordered               (true|yes|1|false|no|0)       'false'
+          interleave            (true|yes|1|false|no|0)       'false'>
+<!--
+Master/Slave resources are a superset of Clones in that instances can also be in one of two states.
+The meaning of the states is specific to the resource.
+
+NOTE: master_slave must contain exactly one primitive resource OR one group resource.
+      It may not contain both, nor may it contain neither.
+      The CRM will complain about your configuration if this criteria is not met.
+      Please use crm_verify to ensure your configuration is valid.
+      The DTD is written this way to be order in-sensitive.
+-->
+<!ELEMENT master_slave (meta_attributes|instance_attributes|primitive|group)*>
+<!ATTLIST master_slave
+          id            CDATA       #REQUIRED
+          description   CDATA       #IMPLIED
+
+          is_managed            CDATA                         #IMPLIED
+          restart_type          (ignore|restart)              'ignore'
+          multiple_active       (stop_start|stop_only|block)  'stop_start'
+          resource_stickiness   CDATA                         #IMPLIED
+
+          notify                (true|yes|1|false|no|0)       'false'
+          globally_unique       (true|yes|1|false|no|0)       'true'
+          ordered               (true|yes|1|false|no|0)       'false'
+          interleave            (true|yes|1|false|no|0)       'false'>
+
+<!--
+Most resource options are configured as instance attributes.
+Some of the built-in options can be configured directly on the resource or as an instance attribute.
+The advantage of using instance attributes is the added flexibility that can be achieved through conditional ?<rule/>s (see below).
+
+You can have multiple sets of 'instance attributes', they are first sorted by score and then processed.
+The first to have its ?<rule/> satisfied and define an attribute wins.
+Subsequent values for the attribute will be ignored.
+
+Note that:
+ * instance_attributes sets with id equal to cib-bootstrap-options are treated as if they have a score of INFINITY.
+ * instance_attributes sets with no score implicitly have a score of zero.
+ * instance_attributes sets with no rule implicitly have a rule that evaluates to true.
+
+The addition of conditional <rule/>s to the instance_attributes object allows for an infinite variety of configurations.
+Just some of the possibilities are:
+ * Specify different resource parameters
+   * depending on the node it is allocated to (a resource may need to use eth1 on host1 but eth0 on host2)
+   * depending on the time of day (run 10 web-servers at night an 100 during the day)
+ * Allow nodes to have different attributes depending on the time-of-day
+   * Set resource_stickiness to avoid failback during business hours but allow resources to be moved to a more preferred node on the weekend
+   * Switch a node between a "front-end" processing group during the day to a "back-end" group at night.
+
+Common instance attributes for all resource types:
+ * priority (integer, default=0):
+   dictates the order in which resources will be processed.
+   If there is an insufficient number of nodes to run all resources, the lower priority resources will be stopped to make sure the higher priority resources remain active.
+
+ * is_managed: See previous description.
+
+ * resource_stickiness: See previous description.
+
+ * target_role: (Started|Stopped|Master|Slave|default, default=#default)
+   * #default : Let the cluster decide what to do with the resource
+   * Started : Ignore any specified value of is_managed or is_managed_default and attempt to start the resource
+   * Stopped : Ignore any specified value of is_managed or is_managed_default and attempt to stop the resource
+   * Master : Ignore any specified value of is_managed, is_managed_default or promotion preferences and attempt to put all instances of a cloned resource into Master mode.
+   * Slave : Ignore any specified value of is_managed, is_managed_default or promotion preferences and attempt to put all instances of a cloned resource into Slave mode.
+
+Common instance attributes for clones:
+ * clone_max (integer, default=1):
+   the number of clones to be run
+
+* clone_node_max (integer, default=1):
+  the maximum number of clones to be run on a single node
+
+Common instance attributes for nodes:
+ * standby (boolean, default=FALSE)
+   if TRUE, indicates that resources can not be run on the node
+-->
+<!ELEMENT instance_attributes (rule*, attributes)>
+<!ATTLIST instance_attributes
+          id                CDATA        #REQUIRED
+          score             CDATA        #IMPLIED>
+
+<!ELEMENT meta_attributes (rule*, attributes)>
+<!ATTLIST meta_attributes
+          id                CDATA        #REQUIRED
+          score             CDATA        #IMPLIED>
+
+<!--
+Every constraint entry also has a 'lifetime' attribute, which expresses when this constraint is applicable.
+For example, a constraint may only be valid during certain times of the day, or days of the week.
+Eventually, we would like to be able to support constraints that only last until events such as the next reboot or the next transition.
+-->
+<!ELEMENT constraints (rsc_order|rsc_colocation|rsc_location)*>
+
+<!--
+rsc_ordering constraints express dependencies between the actions on two resources.
+ * from : A resource id
+ * action : What action does this constraint apply to.
+ * type : Should the action on from occur before or after action on to
+ * to : A resource id
+ * symmetrical : If TRUE, create the reverse constraint for the other action also.
+
+Read as:
+     action from type to_action to
+eg. 
+     start rsc1 after promote rsc2
+
+-->
+<!ELEMENT rsc_order (lifetime?)>
+<!ATTLIST rsc_order
+          id        CDATA #REQUIRED
+          from      CDATA #REQUIRED
+          to        CDATA #REQUIRED
+          action    CDATA		'start'
+          to_action CDATA		'start'
+          type      (before|after)	'after'
+          score     CDATA		'INFINITY'
+          symmetrical (true|yes|1|false|no|0)	'true'>
+
+<!--
+
+Specify where a resource should run relative to another resource
+
+Make rsc 'from' run on the same machine as rsc 'to'
+
+If rsc 'to' cannot run anywhere and 'score' is INFINITY, 
+  then rsc 'from' wont be allowed to run anywhere either
+If rsc 'from' cannot run anywhere, then 'to' wont be affected
+
+-->
+<!ELEMENT rsc_colocation (lifetime?)>
+<!ATTLIST rsc_colocation
+          id             CDATA #REQUIRED
+          from           CDATA #REQUIRED
+          from_role      CDATA #IMPLIED
+          to             CDATA #REQUIRED
+          to_role        CDATA #IMPLIED
+          symmetrical    (true|yes|1|false|no|0)	'false'
+          node_attribute CDATA #IMPLIED
+          score          CDATA #REQUIRED>
+
+<!--
+Specify which nodes are eligible for running a given resource.
+
+During processing, all rsc_location for a given rsc are evaluated.
+
+All nodes start out with their base weight (which defaults to zero).
+This can then be modified (up or down) using any number of rsc_location constraints.
+
+Then the highest non-zero available node is determined to place the resource.
+If multiple nodes have the same weighting, the node with the fewest running resources is chosen.
+
+The rsc field is, surprisingly, a resource id.
+-->
+<!ELEMENT rsc_location (lifetime?,rule*)>
+<!ATTLIST rsc_location
+          id          CDATA #REQUIRED
+          description CDATA #IMPLIED
+          rsc         CDATA #REQUIRED
+          node        CDATA #IMPLIED
+          score       CDATA #IMPLIED>
+<!ELEMENT lifetime (rule+)>
+<!ATTLIST lifetime id  CDATA     #REQUIRED>
+
+<!--
+ * boolean_op
+   determines how the results of multiple expressions are combined.
+
+ * role
+   limits this rule to applying to Multi State resources with the named role.
+   Roles include Started, Stopped, Slave, Master though only the last two are considered useful.
+   NOTE: A rule with role="Master" can not determin the initial location of a clone instance.
+   It will only affect which of the active instances will be promoted.
+
+ * score
+   adjusts the preference for running on the matched nodes.
+   NOTE: Nodes that end up with a negative score will never run the resource.
+   Two special values of "score" exist: INFINITY and -INFINITY.
+   Processing of these special values is as follows:
+
+      INFINITY +/- -INFINITY : -INFINITY
+      INFINITY +/-  int      :  INFINITY
+     -INFINITY +/-  int      : -INFINITY
+  
+ * score_attribute 
+   an alternative to the score attribute that provides extra flexibility.
+  Each node matched by the rule has its score adjusted differently, according to its value for the named node attribute.
+  Thus in the example below, if score_attribute="installed_ram" and nodeA would have its preference to run "the resource" increased by 1024 whereas nodeB would have its preference increased only by half as much.
+
+    <nodes>
+      <node id="uuid1" uname="nodeA" type="normal">
+        <instance_attributes id="uuid1:custom_attrs">
+          <attributes>
+            <nvpair id="uuid1:installed_ram" name="installed_ram" value="1024"/>
+            <nvpair id="uuid1:my_other_attr" name="my_other_attr" value="bob"/>
+          </attributes>
+        </instance_attributes>
+      </node>
+      <node id="uuid2" uname="nodeB" type="normal">
+        <instance_attributes id="uuid2:custom_attrs">
+          <attributes>
+            <nvpair id="uuid2:installed_ram" name="installed_ram" value="512"/>
+          </attributes>
+        </instance_attributes>
+      </node>
+    </nodes>
+-->
+<!ELEMENT rule (expression|date_expression|rule)*>
+<!ATTLIST rule
+          id                  CDATA          #REQUIRED
+          role                CDATA          #IMPLIED
+          score               CDATA          #IMPLIED
+          score_attribute     CDATA          #IMPLIED
+          boolean_op          (or|and)      'and'>
+
+<!--
+Returns TRUE or FALSE depending on the properties of the object being tested.
+
+ * type determines how the values being tested.
+   * integer Values are converted to floats before being compared.
+   * version The "version" type is intended to solve the problem of comparing 1.2 and 1.10
+   * string Uses strcmp
+
+Two built-in attributes are node id #id and node uname #uname so that:
+      attribute=#id value=8C05CA5C-C9E3-11D8-BEE6-000A95B71D78 operation=eq, and
+      attribute=#uname value=test1 operation=eq
+would both be valid tests.
+
+An extra built-in attribute called #is_dc will be set to true or false depending on whether the node is operating as the DC for the cluster.
+Valid tests using this test would be of the form:
+
+        attribute=#is_dc operation=eq value=true,  and
+        attribute=#is_dc operation=eq value=false, and
+        attribute=#is_dc operation=ne value=false
+                        (for those liking double negatives :))
+-->
+<!ELEMENT expression EMPTY>
+<!ATTLIST expression
+          id         CDATA                    #REQUIRED
+          attribute  CDATA                    #REQUIRED
+          operation  (lt|gt|lte|gte|eq|ne|defined|not_defined) #REQUIRED
+          value      CDATA                    #IMPLIED
+          type       (number|string|version) 'string'>
+
+<!--
+ * start : A date-time conforming to the ISO8601 specification.
+ * end : A date-time conforming to the ISO8601 specification.
+   A value for end may, for any usage, be omitted and instead inferred using start and duration.
+ * operation
+   * gt : Compares the current date-time with start date.
+     Checks now > start.
+   * lt : Compares the current date-time with end date.
+     Checks end > now
+   * in_range : Compares the current date-time with start and end.
+     Checks now > start and end > now.
+     If either start or end is omitted, then that part of the comparision is not performed.
+   * date_spec : Performs a cron-like comparision between the contents of date_spec and now.
+     If values for start and/or end are included, now must also be within that range.
+     Or in other words, the date_spec operation can also be made to perform an extra in_range check.
+
+NOTE: Because the comparisions (except for date_spec) include the time, the eq, neq, gte and lte operators have not been implemented.
+-->
+<!ELEMENT date_expression (date_spec?,duration?)>
+<!ATTLIST date_expression
+        id         CDATA  #REQUIRED
+        operation  (in_range|date_spec|gt|lt) 'in_range'
+        start      CDATA  #IMPLIED
+        end        CDATA  #IMPLIED>
+
+<!--
+date_spec is used for (surprisingly  ) date_spec operations.
+
+Fields that are not supplied are ignored.
+
+Fields can contain a single number or a single range.
+Eg.
+monthdays="1" (Matches the first day of every month) and hours="09-17" (Matches hours between 9am and 5pm inclusive) are both valid values.
+weekdays="1,2" and weekdays="1-2,5-6" are NOT valid ranges.
+This may change in a future release.
+
+ * seconds : Value range 0-59
+ * minutes : Value range 0-59
+ * hours : Value range 0-23
+ * monthdays : Value range 0-31 (depending on current month and year)
+ * weekdays : Value range 1-7 (1=Monday, 7=Sunday)
+ * yeardays : Value range 1-366 (depending on current year)
+ * months : Value range 1-12
+ * weeks : Value range 1-53 (depending on weekyear)
+ * weekyears : Value range 0...
+  (NOTE: weekyears may differ from Gregorian years.
+  Eg. 2005-001 Ordinal == 2005-01-01 Gregorian == 2004-W53-6 Weekly )
+ * years : Value range 0...
+ * moon : Value range 0..7 - 0 is new, 4 is full moon.
+   Because we can(tm)
+-->
+
+<!ELEMENT date_spec EMPTY>
+<!ATTLIST date_spec
+        id         CDATA  #REQUIRED
+        hours      CDATA  #IMPLIED
+        monthdays  CDATA  #IMPLIED
+        weekdays   CDATA  #IMPLIED
+        yeardays   CDATA  #IMPLIED
+        months     CDATA  #IMPLIED
+        weeks      CDATA  #IMPLIED
+        weekyears  CDATA  #IMPLIED
+        years      CDATA  #IMPLIED
+        moon       CDATA  #IMPLIED>
+
+<!--
+duration is optionally used for calculating a value for end.
+Any field not supplied is assumed to be zero and ignored.
+Negative values might work.
+Eg. months=11 should be equivalent to writing years=1, months=-1 but is not encouraged.
+-->
+<!ELEMENT duration EMPTY>
+<!ATTLIST duration
+        id         CDATA  #REQUIRED
+        hours      CDATA  #IMPLIED
+        monthdays  CDATA  #IMPLIED
+        weekdays   CDATA  #IMPLIED
+        yeardays   CDATA  #IMPLIED
+        months     CDATA  #IMPLIED
+        weeks      CDATA  #IMPLIED
+        years      CDATA  #IMPLIED>
+<!--
+Example 1: True if now is any time in the year 2005.
+
+<rule id="rule1">
+  <date_expression id="date_expr1" start="2005-001" operation="in_range">
+    <duration years="1"/>
+  </date_expression>
+</rule>
+Example 2: Equivalent expression.
+
+<rule id="rule2">
+  <date_expression id="date_expr2" operation="date_spec">
+    <date_spec years="2005"/>
+  </date_expression>
+</rule>
+Example 3: 9am-5pm, Mon-Friday
+
+<rule id="rule3">
+  <date_expression id="date_expr3" operation="date_spec">
+    <date_spec hours="9-16" days="1-5"/>
+  </date_expression>
+</rule>
+Example 4: 9am-5pm, Mon-Friday, or all day saturday
+
+<rule id="rule4" boolean_op="or">
+  <date_expression id="date_expr4-1" operation="date_spec">
+    <date_spec hours="9-16" days="1-5"/>
+  </date_expression>
+  <date_expression id="date_expr4-2" operation="date_spec">
+    <date_spec days="6"/>
+  </date_expression>
+</rule>
+Example 5: 9am-5pm or 9pm-12pm, Mon-Friday
+
+<rule id="rule5" boolean_op="and">
+  <rule id="rule5-nested1" boolean_op="or">
+    <date_expression id="date_expr5-1" operation="date_spec">
+      <date_spec hours="9-16"/>
+    </date_expression>
+    <date_expression id="date_expr5-2" operation="date_spec">
+      <date_spec hours="21-23"/>
+    </date_expression>
+  </rule>
+  <date_expression id="date_expr5-3" operation="date_spec">
+    <date_spec days="1-5"/>
+  </date_expression>
+</rule>
+Example 6: Mondays in March 2005
+
+<rule id="rule6" boolean_op="and">
+  <date_expression id="date_expr6" operation="date_spec" start="2005-03-01" end="2005-04-01">
+    <date_spec weekdays="1"/>
+  </date_expression>
+</rule>
+NOTE: Because no time is specified, 00:00:00 is implied.
+This means that the range includes all of 2005-03-01 but none of 2005-04-01.
+You may wish to write end="2005-03-31T23:59:59" to avoid confusion.
+
+Example 7: Friday the 13th if it is a full moon
+
+<rule id="rule7" boolean_op="and">
+  <date_expression id="date_expr7" operation="date_spec">
+    <date_spec weekdays="5" monthdays="13" moon="4"/>
+  </date_expression>
+</rule>
+-->
+
+<!--
+You don't have to give a value.
+There's a difference between a key not being present and a key not having a value.
+-->
+<!ELEMENT nvpair EMPTY>
+<!ATTLIST nvpair
+          id     CDATA  #REQUIRED
+          name   CDATA  #REQUIRED
+          value  CDATA  #IMPLIED>
+
+<!ELEMENT attributes (nvpair*)>
+
+<!--
+These attributes take effect only if no value has previously been applied as part of the node's definition.
+Additionally, when the node reboots all settings made here are erased.
+
+id must be the UUID of the node.
+-->
+<!ELEMENT transient_attributes (instance_attributes*)>
+<!ATTLIST transient_attributes id CDATA #IMPLIED>
+
+<!--=========== Status - Advanced Use Only ===========-->
+
+<!--
+Details about the status of each node configured.
+
+HERE BE DRAGONS
+
+Never, ever edit this section directly or using cibadmin.
+The consequences of doing so are many and varied but rarely ever good or what you anticipated.
+To discourage this, the status section is no longer even written to disk, and is always discarded at startup.
+
+To avoid duplication of data, state entries only carry references to nodes and resources.
+-->
+<!ELEMENT status (node_state*)>
+
+<!--
+The state of a given node.
+
+This information is updated by the DC based on inputs from sources such as the CCM, status messages from remote LRMs and requests from other nodes.
+ * id       -  is the node's UUID.
+ * uname    - is the result of uname -n for the node.
+ * crmd     - records whether the crmd process is running on the node
+ * in_ccm   - records whether the node is part of our membership partition
+ * join     - is the node's membership status with the current DC.
+ * expected - is the DC's expectation of whether the node is up or not.
+ * shutdown - is set to the time at which the node last asked to be shut down
+
+Ideally, there should be a node_state entry for every entry in the <nodes> list.
+
+-->
+<!ELEMENT node_state (transient_attributes|lrm)*>
+<!ATTLIST node_state
+        id              CDATA                   #REQUIRED
+        uname           CDATA                   #REQUIRED
+        ha              (active|dead)           #IMPLIED
+        crmd            (online|offline)        'offline'
+        join            (pending|member|down)   'down'
+        expected        (pending|member|down)   'down'
+        in_ccm          (true|yes|1|false|no|0) 'false'
+        crm-debug-origin CDATA                  #IMPLIED
+        shutdown        CDATA                   #IMPLIED
+        clear_shutdown  CDATA                   #IMPLIED>
+
+<!--
+Information from the Local Resource Manager of the node.
+It contains a list of all resource's added (but not necessarily still active) on the node.
+-->
+<!ELEMENT lrm (lrm_resources)>
+<!ATTLIST lrm id CDATA #REQUIRED>
+
+<!ELEMENT lrm_resources (lrm_resource*)>
+<!ELEMENT lrm_resource (lrm_rsc_op*)>
+<!ATTLIST lrm_resource
+          id            CDATA #REQUIRED
+          class             (lsb|ocf|heartbeat|stonith) #REQUIRED
+          type              CDATA        #REQUIRED
+          provider          CDATA        #IMPLIED>
+<!--
+lrm_rsc_op (Resource Status)
+
+id: Set to [operation] +"_"+ [operation] +"_"+ [an_interval_in_milliseconds]
+
+operation typically start, stop, or monitor
+
+call_id: Supplied by the LRM, determins the order of in which lrm_rsc_op objects should be processed in order to determin the resource's true state
+
+rc_code is the last return code from the resource
+
+rsc_state is the state of the resource after the action completed and should be used as a guide only.
+
+transition_key contains an identifier and seqence number for the transition.
+
+At startup, the TEngine registers the identifier and starts the sequence at zero.
+It is used to identify the source of resource actions.
+
+transition_magic contains an identifier containing call_id, rc_code, and {{transition_key}}}.
+
+As the name suggests, it is a piece of magic that allows the TE to always identify the action from the stream of xml-diffs it subscribes to from the CIB.
+
+op_status is supplied by the LRM and conforms to this enum:
+
+typedef enum {
+        LRM_OP_PENDING = -1,
+        LRM_OP_DONE,
+        LRM_OP_CANCELLED,
+        LRM_OP_TIMEOUT,
+        LRM_OP_NOTSUPPORTED,
+        LRM_OP_ERROR,
+} op_status_t;
+The parameters section allows us to detect when a resource's definition has changed and the needs to be restarted (so the changes take effect).
+-->
+<!ELEMENT lrm_rsc_op EMPTY>
+<!ATTLIST lrm_rsc_op
+          id                    CDATA #REQUIRED
+          operation             CDATA #REQUIRED
+          op_status             CDATA #REQUIRED
+          rc_code               CDATA #REQUIRED
+          call_id               CDATA #REQUIRED
+          crm_feature_set       CDATA #REQUIRED
+          crm-debug-origin      CDATA #IMPLIED
+          migrate_from          CDATA #IMPLIED
+          transition_key        CDATA #IMPLIED
+          op_digest             CDATA #IMPLIED
+          op_restart_digest     CDATA #IMPLIED
+          op_force_restart      CDATA #IMPLIED
+          interval              CDATA #REQUIRED
+          transition_magic      CDATA #REQUIRED>
--- a/crm/crmd/Makefile.in
+++ b/crm/crmd/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,13 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +32,86 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+halib_PROGRAMS = crmd$(EXEEXT) atest$(EXEEXT)
+subdir = crm/crmd
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(halibdir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(halib_PROGRAMS)
+am_atest_OBJECTS = atest.$(OBJEXT)
+atest_OBJECTS = $(am_atest_OBJECTS)
+am__DEPENDENCIES_1 =
+am__DEPENDENCIES_2 = $(top_builddir)/lib/clplumbing/libplumb.la \
+	$(top_builddir)/lib/crm/common/libcrmcommon.la \
+	$(top_builddir)/lib/crm/pengine/libpe_rules.la \
+	$(top_builddir)/lib/crm/cib/libcib.la \
+	$(top_builddir)/lib/hbclient/libhbclient.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+atest_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_crmd_OBJECTS = main.$(OBJEXT) crmd.$(OBJEXT) fsa.$(OBJEXT) \
+	control.$(OBJEXT) messages.$(OBJEXT) ccm.$(OBJEXT) \
+	callbacks.$(OBJEXT) election.$(OBJEXT) join_client.$(OBJEXT) \
+	join_dc.$(OBJEXT) subsystems.$(OBJEXT) cib.$(OBJEXT) \
+	pengine.$(OBJEXT) tengine.$(OBJEXT) lrm.$(OBJEXT) \
+	utils.$(OBJEXT) misc.$(OBJEXT)
+crmd_OBJECTS = $(am_crmd_OBJECTS)
+crmd_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	$(top_builddir)/lib/lrm/liblrm.la \
+	$(top_builddir)/membership/ccm/libccmclient.la
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(atest_SOURCES) $(crmd_SOURCES)
+DIST_SOURCES = $(atest_SOURCES) $(crmd_SOURCES)
+HEADERS = $(noinst_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +134,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +177,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +188,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +196,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -173,14 +210,11 @@
 LIBNETDEFINES = @LIBNETDEFINES@
 LIBNETLIBS = @LIBNETLIBS@
 LIBOBJS = @LIBOBJS@
-
 LIBRT = @LIBRT@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -189,15 +223,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -227,8 +258,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -249,8 +278,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -261,20 +288,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -282,17 +297,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -300,6 +317,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -321,6 +339,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -335,12 +354,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # Copyright (C) 2004 Andrew Beekhof
@@ -360,15 +382,12 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include	\
 		-I$(top_builddir)/libltdl   -I$(top_srcdir)/libltdl	\
 		-I$(top_builddir)/linux-ha  -I$(top_srcdir)/linux-ha \
 		-I$(top_builddir)           -I$(top_srcdir)
 
-
 EXTRA_DIST = 
-
 hadir = $(sysconfdir)/ha.d
 halibdir = $(libdir)/@HB_PKG@
 commmoddir = $(halibdir)/modules/comm
@@ -378,7 +397,6 @@
 crmdir = $(havarlibdir)/crm
 apigid = @HA_APIGID@
 crmuid = @HA_CCMUID@
-
 COMMONLIBS = \
 		$(top_builddir)/lib/clplumbing/libplumb.la		\
 		$(top_builddir)/lib/crm/common/libcrmcommon.la	\
@@ -391,139 +409,94 @@
 AM_CFLAGS = @CFLAGS@						\
 		$(CRM_DEBUG_FLAGS)
 
-
 lib_LTLIBRARIES = 
-
-halib_PROGRAMS = crmd atest
-
 noinst_HEADERS = crmd.h crmd_fsa.h crmd_messages.h fsa_defines.h 	\
 		fsa_matrix.h fsa_proto.h crmd_utils.h crmd_callbacks.h \
 		crmd_lrm.h
 
-
 atest_SOURCES = atest.c
 atest_LDADD = $(COMMONLIBS)
-
 crmd_SOURCES = main.c crmd.c 					\
 		fsa.c control.c messages.c ccm.c callbacks.c		\
 		election.c join_client.c join_dc.c subsystems.c 	\
 		cib.c pengine.c tengine.c lrm.c 			\
 		utils.c misc.c
 
-
 crmd_LDADD = $(COMMONLIBS) 					\
 		  $(top_builddir)/lib/lrm/liblrm.la			\
 		  $(top_builddir)/membership/ccm/libccmclient.la  
 
-subdir = crm/crmd
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(lib_LTLIBRARIES)
-
-halib_PROGRAMS = crmd$(EXEEXT) atest$(EXEEXT)
-PROGRAMS = $(halib_PROGRAMS)
-
-am_atest_OBJECTS = atest.$(OBJEXT)
-atest_OBJECTS = $(am_atest_OBJECTS)
-atest_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/crm/common/libcrmcommon.la \
-	$(top_builddir)/lib/crm/pengine/libpe_rules.la \
-	$(top_builddir)/lib/crm/cib/libcib.la \
-	$(top_builddir)/lib/hbclient/libhbclient.la
-atest_LDFLAGS =
-am_crmd_OBJECTS = main.$(OBJEXT) crmd.$(OBJEXT) fsa.$(OBJEXT) \
-	control.$(OBJEXT) messages.$(OBJEXT) ccm.$(OBJEXT) \
-	callbacks.$(OBJEXT) election.$(OBJEXT) join_client.$(OBJEXT) \
-	join_dc.$(OBJEXT) subsystems.$(OBJEXT) cib.$(OBJEXT) \
-	pengine.$(OBJEXT) tengine.$(OBJEXT) lrm.$(OBJEXT) \
-	utils.$(OBJEXT) misc.$(OBJEXT)
-crmd_OBJECTS = $(am_crmd_OBJECTS)
-crmd_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/crm/common/libcrmcommon.la \
-	$(top_builddir)/lib/crm/pengine/libpe_rules.la \
-	$(top_builddir)/lib/crm/cib/libcib.la \
-	$(top_builddir)/lib/hbclient/libhbclient.la \
-	$(top_builddir)/lib/lrm/liblrm.la \
-	$(top_builddir)/membership/ccm/libccmclient.la
-crmd_LDFLAGS =
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/atest.Po ./$(DEPDIR)/callbacks.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/ccm.Po ./$(DEPDIR)/cib.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/control.Po ./$(DEPDIR)/crmd.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/election.Po ./$(DEPDIR)/fsa.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/join_client.Po ./$(DEPDIR)/join_dc.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/lrm.Po ./$(DEPDIR)/main.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/messages.Po ./$(DEPDIR)/misc.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/pengine.Po ./$(DEPDIR)/subsystems.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/tengine.Po ./$(DEPDIR)/utils.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(atest_SOURCES) $(crmd_SOURCES)
-HEADERS = $(noinst_HEADERS)
-
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(atest_SOURCES) $(crmd_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  crm/crmd/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  crm/crmd/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-libLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-halibPROGRAMS: $(halib_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	test -z "$(halibdir)" || $(MKDIR_P) "$(DESTDIR)$(halibdir)"
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -531,8 +504,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(halibdir)/$$f"; \
-	  rm -f $(DESTDIR)$(halibdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(halibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(halibdir)/$$f"; \
 	done
 
 clean-halibPROGRAMS:
@@ -543,13 +516,13 @@
 	done
 atest$(EXEEXT): $(atest_OBJECTS) $(atest_DEPENDENCIES) 
 	@rm -f atest$(EXEEXT)
-	$(LINK) $(atest_LDFLAGS) $(atest_OBJECTS) $(atest_LDADD) $(LIBS)
+	$(LINK) $(atest_OBJECTS) $(atest_LDADD) $(LIBS)
 crmd$(EXEEXT): $(crmd_OBJECTS) $(crmd_DEPENDENCIES) 
 	@rm -f crmd$(EXEEXT)
-	$(LINK) $(crmd_LDFLAGS) $(crmd_OBJECTS) $(crmd_LDADD) $(LIBS)
+	$(LINK) $(crmd_OBJECTS) $(crmd_LDADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -574,37 +547,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -612,18 +573,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -632,6 +581,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -643,10 +593,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -669,28 +620,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -704,9 +650,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(halibdir)
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(halibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -724,7 +671,7 @@
 mostlyclean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -739,24 +686,34 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-halibPROGRAMS
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-exec-local install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -777,21 +734,25 @@
 
 ps-am:
 
-uninstall-am: uninstall-halibPROGRAMS uninstall-info-am \
-	uninstall-libLTLIBRARIES uninstall-local
+uninstall-am: uninstall-halibPROGRAMS uninstall-libLTLIBRARIES \
+	uninstall-local
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-halibPROGRAMS clean-libLTLIBRARIES clean-libtool ctags \
-	distclean distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
 	install-exec-am install-exec-local install-halibPROGRAMS \
-	install-info install-info-am install-libLTLIBRARIES install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
-	pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-halibPROGRAMS uninstall-info-am \
+	install-html install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-halibPROGRAMS \
 	uninstall-libLTLIBRARIES uninstall-local
 
 
--- a/crm/pengine/Makefile.in
+++ b/crm/pengine/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,13 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +32,92 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+halib_PROGRAMS = pengine$(EXEEXT)
+hasbin_PROGRAMS = ptest$(EXEEXT)
+subdir = crm/pengine
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(halibdir)" \
+	"$(DESTDIR)$(hasbindir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+libpengine_la_LIBADD =
+am_libpengine_la_OBJECTS = pengine.lo allocate.lo utils.lo \
+	constraints.lo native.lo group.lo clone.lo master.lo graph.lo
+libpengine_la_OBJECTS = $(am_libpengine_la_OBJECTS)
+libpengine_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libpengine_la_LDFLAGS) $(LDFLAGS) -o $@
+halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+hasbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(halib_PROGRAMS) $(hasbin_PROGRAMS)
+am_pengine_OBJECTS = main.$(OBJEXT)
+pengine_OBJECTS = $(am_pengine_OBJECTS)
+am__DEPENDENCIES_1 =
+am__DEPENDENCIES_2 = $(top_builddir)/lib/clplumbing/libplumb.la \
+	$(top_builddir)/lib/crm/common/libcrmcommon.la \
+	$(top_builddir)/lib/crm/pengine/libpe_status.la libpengine.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+pengine_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	$(top_builddir)/lib/crm/cib/libcib.la
+am_ptest_OBJECTS = ptest.$(OBJEXT)
+ptest_OBJECTS = $(am_ptest_OBJECTS)
+ptest_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	$(top_builddir)/lib/crm/cib/libcib.la \
+	$(top_builddir)/lib/crm/transition/libtransitioner.la
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libpengine_la_SOURCES) $(pengine_SOURCES) $(ptest_SOURCES)
+DIST_SOURCES = $(libpengine_la_SOURCES) $(pengine_SOURCES) \
+	$(ptest_SOURCES)
+HEADERS = $(noinst_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +140,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +183,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +194,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +202,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -173,14 +216,11 @@
 LIBNETDEFINES = @LIBNETDEFINES@
 LIBNETLIBS = @LIBNETLIBS@
 LIBOBJS = @LIBOBJS@
-
 LIBRT = @LIBRT@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -189,15 +229,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -227,8 +264,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -249,8 +284,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -261,20 +294,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -282,17 +303,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -300,6 +323,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -321,6 +345,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -335,12 +360,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # Copyright (C) 2004 Andrew Beekhof
@@ -360,13 +388,11 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include	\
 		-I$(top_builddir)/libltdl   -I$(top_srcdir)/libltdl	\
 		-I$(top_builddir)/linux-ha  -I$(top_srcdir)/linux-ha \
 		-I$(top_builddir)           -I$(top_srcdir)
 
-
 hadir = $(sysconfdir)/ha.d
 hasbindir = $(sbindir)
 halibdir = $(libdir)/@HB_PKG@
@@ -378,7 +404,6 @@
 crmdir = $(havarlibdir)/crm
 apigid = @HA_APIGID@
 crmuid = @HA_CCMUID@
-
 COMMONLIBS = \
 		$(top_builddir)/lib/clplumbing/libplumb.la		\
 		$(top_builddir)/lib/crm/common/libcrmcommon.la		\
@@ -389,24 +414,16 @@
 		$(LIBRT)
 
 AM_CFLAGS = @CFLAGS@ $(CRM_DEBUG_FLAGS)
-
 lib_LTLIBRARIES = libpengine.la
-
-halib_PROGRAMS = pengine
-hasbin_PROGRAMS = ptest
-
 noinst_HEADERS = allocate.h utils.h pengine.h
-
 #utils.h pengine.h
 libpengine_la_LDFLAGS = -version-info 3:0:0
 # -L$(top_builddir)/lib/pils -lpils -export-dynamic -module -avoid-version 
 libpengine_la_SOURCES = pengine.c allocate.c utils.c constraints.c \
 			native.c group.c clone.c master.c graph.c
 
-
 pengine_SOURCES = main.c
 pengine_LDADD = $(COMMONLIBS)	$(top_builddir)/lib/crm/cib/libcib.la
-
 # libcib for get_object_root()
 #		$(top_builddir)/lib/hbclient/libhbclient.la
 ptest_SOURCES = ptest.c 
@@ -414,112 +431,79 @@
 		$(top_builddir)/lib/crm/cib/libcib.la			\
 		$(top_builddir)/lib/crm/transition/libtransitioner.la
 
-subdir = crm/pengine
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(lib_LTLIBRARIES)
-
-libpengine_la_LIBADD =
-am_libpengine_la_OBJECTS = pengine.lo allocate.lo utils.lo \
-	constraints.lo native.lo group.lo clone.lo master.lo graph.lo
-libpengine_la_OBJECTS = $(am_libpengine_la_OBJECTS)
-halib_PROGRAMS = pengine$(EXEEXT)
-hasbin_PROGRAMS = ptest$(EXEEXT)
-PROGRAMS = $(halib_PROGRAMS) $(hasbin_PROGRAMS)
-
-am_pengine_OBJECTS = main.$(OBJEXT)
-pengine_OBJECTS = $(am_pengine_OBJECTS)
-pengine_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/crm/common/libcrmcommon.la \
-	$(top_builddir)/lib/crm/pengine/libpe_status.la libpengine.la \
-	$(top_builddir)/lib/crm/cib/libcib.la
-pengine_LDFLAGS =
-am_ptest_OBJECTS = ptest.$(OBJEXT)
-ptest_OBJECTS = $(am_ptest_OBJECTS)
-ptest_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/crm/common/libcrmcommon.la \
-	$(top_builddir)/lib/crm/pengine/libpe_status.la libpengine.la \
-	$(top_builddir)/lib/crm/cib/libcib.la \
-	$(top_builddir)/lib/crm/transition/libtransitioner.la
-ptest_LDFLAGS =
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/allocate.Plo ./$(DEPDIR)/clone.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/constraints.Plo ./$(DEPDIR)/graph.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/group.Plo ./$(DEPDIR)/main.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/master.Plo ./$(DEPDIR)/native.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/pengine.Plo ./$(DEPDIR)/ptest.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/utils.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libpengine_la_SOURCES) $(pengine_SOURCES) \
-	$(ptest_SOURCES)
-HEADERS = $(noinst_HEADERS)
-
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(libpengine_la_SOURCES) $(pengine_SOURCES) $(ptest_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  crm/pengine/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  crm/pengine/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-libLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libpengine.la: $(libpengine_la_OBJECTS) $(libpengine_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libpengine_la_LDFLAGS) $(libpengine_la_OBJECTS) $(libpengine_la_LIBADD) $(LIBS)
-halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+	$(libpengine_la_LINK) -rpath $(libdir) $(libpengine_la_OBJECTS) $(libpengine_la_LIBADD) $(LIBS)
 install-halibPROGRAMS: $(halib_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	test -z "$(halibdir)" || $(MKDIR_P) "$(DESTDIR)$(halibdir)"
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -527,8 +511,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(halibdir)/$$f"; \
-	  rm -f $(DESTDIR)$(halibdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(halibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(halibdir)/$$f"; \
 	done
 
 clean-halibPROGRAMS:
@@ -537,18 +521,17 @@
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
 	done
-hasbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-hasbinPROGRAMS: $(hasbin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(hasbindir)
+	test -z "$(hasbindir)" || $(MKDIR_P) "$(DESTDIR)$(hasbindir)"
 	@list='$(hasbin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(hasbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(hasbindir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(hasbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(hasbindir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(hasbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(hasbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(hasbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(hasbindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -556,8 +539,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(hasbin_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(hasbindir)/$$f"; \
-	  rm -f $(DESTDIR)$(hasbindir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(hasbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(hasbindir)/$$f"; \
 	done
 
 clean-hasbinPROGRAMS:
@@ -568,13 +551,13 @@
 	done
 pengine$(EXEEXT): $(pengine_OBJECTS) $(pengine_DEPENDENCIES) 
 	@rm -f pengine$(EXEEXT)
-	$(LINK) $(pengine_LDFLAGS) $(pengine_OBJECTS) $(pengine_LDADD) $(LIBS)
+	$(LINK) $(pengine_OBJECTS) $(pengine_LDADD) $(LIBS)
 ptest$(EXEEXT): $(ptest_OBJECTS) $(ptest_DEPENDENCIES) 
 	@rm -f ptest$(EXEEXT)
-	$(LINK) $(ptest_LDFLAGS) $(ptest_OBJECTS) $(ptest_LDADD) $(LIBS)
+	$(LINK) $(ptest_OBJECTS) $(ptest_LDADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -592,37 +575,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -630,18 +601,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -650,6 +609,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -661,10 +621,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -687,28 +648,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -722,9 +678,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(halibdir) $(DESTDIR)$(hasbindir)
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(halibdir)" "$(DESTDIR)$(hasbindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -742,7 +699,7 @@
 mostlyclean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -757,24 +714,34 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-halibPROGRAMS install-hasbinPROGRAMS
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-exec-local install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -796,22 +763,27 @@
 ps-am:
 
 uninstall-am: uninstall-halibPROGRAMS uninstall-hasbinPROGRAMS \
-	uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
+	uninstall-libLTLIBRARIES uninstall-local
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-halibPROGRAMS clean-hasbinPROGRAMS clean-libLTLIBRARIES \
 	clean-libtool ctags distclean distclean-compile \
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-exec-local \
-	install-halibPROGRAMS install-hasbinPROGRAMS install-info \
-	install-info-am install-libLTLIBRARIES install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
-	pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-halibPROGRAMS uninstall-hasbinPROGRAMS \
-	uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-exec-local \
+	install-halibPROGRAMS install-hasbinPROGRAMS install-html \
+	install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-halibPROGRAMS \
+	uninstall-hasbinPROGRAMS uninstall-libLTLIBRARIES \
+	uninstall-local
 
 
 clean-generic:
--- a/crm/tengine/Makefile.in
+++ b/crm/tengine/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,12 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +31,75 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+halib_PROGRAMS = tengine$(EXEEXT) ttest$(EXEEXT)
+subdir = crm/tengine
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(halibdir)"
+halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(halib_PROGRAMS)
+am_tengine_OBJECTS = actions.$(OBJEXT) events.$(OBJEXT) \
+	utils.$(OBJEXT) callbacks.$(OBJEXT) main.$(OBJEXT)
+tengine_OBJECTS = $(am_tengine_OBJECTS)
+am__DEPENDENCIES_1 =
+am__DEPENDENCIES_2 = $(top_builddir)/lib/clplumbing/libplumb.la \
+	$(top_builddir)/lib/crm/common/libcrmcommon.la \
+	$(top_builddir)/lib/crm/cib/libcib.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+tengine_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	$(top_builddir)/lib/fencing/libstonithd.la \
+	$(top_builddir)/lib/crm/transition/libtransitioner.la
+am_ttest_OBJECTS = actions.$(OBJEXT) events.$(OBJEXT) utils.$(OBJEXT) \
+	callbacks.$(OBJEXT) ttest.$(OBJEXT)
+ttest_OBJECTS = $(am_ttest_OBJECTS)
+ttest_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	$(top_builddir)/lib/fencing/libstonithd.la \
+	$(top_builddir)/lib/crm/transition/libtransitioner.la
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(tengine_SOURCES) $(ttest_SOURCES)
+DIST_SOURCES = $(tengine_SOURCES) $(ttest_SOURCES)
+HEADERS = $(noinst_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +122,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +165,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +176,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +184,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -173,14 +198,11 @@
 LIBNETDEFINES = @LIBNETDEFINES@
 LIBNETLIBS = @LIBNETLIBS@
 LIBOBJS = @LIBOBJS@
-
 LIBRT = @LIBRT@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -189,15 +211,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -227,8 +246,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -249,8 +266,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -261,20 +276,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -282,17 +285,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -300,6 +305,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -321,6 +327,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -335,12 +342,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # Copyright (C) 2004 Andrew Beekhof
@@ -360,20 +370,16 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include	\
 		-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl 	\
 		-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha	\
 		-I$(top_builddir) -I$(top_srcdir)
 
-
 hadir = $(sysconfdir)/ha.d
 halibdir = $(libdir)/@HB_PKG@
 commmoddir = $(halibdir)/modules/comm
 havarlibdir = $(localstatedir)/lib/@HB_PKG@
-
 crmdir = $(havarlibdir)/crm
-
 COMMONLIBS = \
 		$(top_builddir)/lib/clplumbing/libplumb.la		\
 		$(top_builddir)/lib/crm/common/libcrmcommon.la 	\
@@ -382,90 +388,61 @@
 		$(LIBRT)
 
 AM_CFLAGS = @CFLAGS@ $(CRM_DEBUG_FLAGS)
-
-halib_PROGRAMS = tengine ttest
-
 noinst_HEADERS = tengine.h te_callbacks.h
-
 tengine_SOURCES = actions.c events.c utils.c callbacks.c main.c
 tengine_LDADD = $(COMMONLIBS) \
                     $(top_builddir)/lib/fencing/libstonithd.la \
                     $(top_builddir)/lib/crm/transition/libtransitioner.la
 
-
 ttest_SOURCES = actions.c events.c utils.c callbacks.c ttest.c
 ttest_LDADD = $(COMMONLIBS) \
                     $(top_builddir)/lib/fencing/libstonithd.la \
                     $(top_builddir)/lib/crm/transition/libtransitioner.la
 
-subdir = crm/tengine
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-halib_PROGRAMS = tengine$(EXEEXT) ttest$(EXEEXT)
-PROGRAMS = $(halib_PROGRAMS)
-
-am_tengine_OBJECTS = actions.$(OBJEXT) events.$(OBJEXT) utils.$(OBJEXT) \
-	callbacks.$(OBJEXT) main.$(OBJEXT)
-tengine_OBJECTS = $(am_tengine_OBJECTS)
-tengine_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/crm/common/libcrmcommon.la \
-	$(top_builddir)/lib/crm/cib/libcib.la \
-	$(top_builddir)/lib/fencing/libstonithd.la \
-	$(top_builddir)/lib/crm/transition/libtransitioner.la
-tengine_LDFLAGS =
-am_ttest_OBJECTS = actions.$(OBJEXT) events.$(OBJEXT) utils.$(OBJEXT) \
-	callbacks.$(OBJEXT) ttest.$(OBJEXT)
-ttest_OBJECTS = $(am_ttest_OBJECTS)
-ttest_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/crm/common/libcrmcommon.la \
-	$(top_builddir)/lib/crm/cib/libcib.la \
-	$(top_builddir)/lib/fencing/libstonithd.la \
-	$(top_builddir)/lib/crm/transition/libtransitioner.la
-ttest_LDFLAGS =
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/actions.Po ./$(DEPDIR)/callbacks.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/events.Po ./$(DEPDIR)/main.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/ttest.Po ./$(DEPDIR)/utils.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(tengine_SOURCES) $(ttest_SOURCES)
-HEADERS = $(noinst_HEADERS)
-
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(tengine_SOURCES) $(ttest_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  crm/tengine/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  crm/tengine/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-halibPROGRAMS: $(halib_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	test -z "$(halibdir)" || $(MKDIR_P) "$(DESTDIR)$(halibdir)"
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -473,8 +450,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(halibdir)/$$f"; \
-	  rm -f $(DESTDIR)$(halibdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(halibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(halibdir)/$$f"; \
 	done
 
 clean-halibPROGRAMS:
@@ -485,13 +462,13 @@
 	done
 tengine$(EXEEXT): $(tengine_OBJECTS) $(tengine_DEPENDENCIES) 
 	@rm -f tengine$(EXEEXT)
-	$(LINK) $(tengine_LDFLAGS) $(tengine_OBJECTS) $(tengine_LDADD) $(LIBS)
+	$(LINK) $(tengine_OBJECTS) $(tengine_LDADD) $(LIBS)
 ttest$(EXEEXT): $(ttest_OBJECTS) $(ttest_DEPENDENCIES) 
 	@rm -f ttest$(EXEEXT)
-	$(LINK) $(ttest_LDFLAGS) $(ttest_OBJECTS) $(ttest_LDADD) $(LIBS)
+	$(LINK) $(ttest_OBJECTS) $(ttest_LDADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -504,37 +481,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -542,18 +507,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -562,6 +515,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -573,10 +527,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -599,28 +554,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -634,9 +584,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(HEADERS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	for dir in "$(DESTDIR)$(halibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -654,7 +605,7 @@
 mostlyclean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -662,30 +613,41 @@
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
-clean-am: clean-generic clean-halibPROGRAMS clean-libtool mostlyclean-am
+clean-am: clean-generic clean-halibPROGRAMS clean-libtool \
+	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-halibPROGRAMS
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-exec-local
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -706,20 +668,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-halibPROGRAMS uninstall-info-am uninstall-local
+uninstall-am: uninstall-halibPROGRAMS uninstall-local
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-halibPROGRAMS clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-exec-local install-halibPROGRAMS \
-	install-info install-info-am install-man install-strip \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-exec-local \
+	install-halibPROGRAMS install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-halibPROGRAMS \
-	uninstall-info-am uninstall-local
+	uninstall-local
 
 
 clean-generic:
--- a/cts/Makefile.in
+++ b/cts/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,12 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +31,61 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = cts
+DIST_COMMON = README $(cts_PYTHON) $(srcdir)/CIB.py.in \
+	$(srcdir)/CM_LinuxHAv2.py.in $(srcdir)/CM_fs.py.in \
+	$(srcdir)/CM_hb.py.in $(srcdir)/CTS.py.in \
+	$(srcdir)/CTSaudits.py.in $(srcdir)/CTSlab.py.in \
+	$(srcdir)/CTSproxy.py.in $(srcdir)/CTStests.py.in \
+	$(srcdir)/LSBDummy.in $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/OCFIPraTest.py.in \
+	$(srcdir)/extracttests.py.in $(srcdir)/getpeinputs.sh.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES = CM_fs.py CM_hb.py CTS.py CTSaudits.py CTSlab.py \
+	CTStests.py CM_LinuxHAv2.py CTSproxy.py extracttests.py \
+	getpeinputs.sh OCFIPraTest.py CIB.py LSBDummy
+am__installdirs = "$(DESTDIR)$(ctsdir)" "$(DESTDIR)$(ctsdir)" \
+	"$(DESTDIR)$(ctsdir)"
+ctsSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(cts_SCRIPTS)
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ctsPYTHON_INSTALL = $(INSTALL_DATA)
+py_compile = $(top_srcdir)/py-compile
+ctsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(cts_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +108,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +151,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +162,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +170,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +189,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +197,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +232,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +252,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +262,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +271,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +291,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +313,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +328,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # heartbeat: Linux-HA heartbeat code
@@ -361,9 +358,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 ctsdir = @HA_NOARCHDATAHBDIR@/cts
-
 cts_PYTHON = \
 			CM_fs.py		\
 			CM_hb.py		\
@@ -377,77 +372,79 @@
 			OCFIPraTest.py		\
 			CIB.py
 
-
 cts_DATA = README
-
 cts_SCRIPTS = \
 			CTSproxy.py		\
 			getpeinputs.sh		\
 			LSBDummy
 
-subdir = cts
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES = CM_fs.py CM_hb.py CTS.py CTSaudits.py CTSlab.py \
-	CTStests.py CM_LinuxHAv2.py CTSproxy.py extracttests.py \
-	getpeinputs.sh OCFIPraTest.py CIB.py LSBDummy
-SCRIPTS = $(cts_SCRIPTS)
-
-DIST_SOURCES =
-py_compile = $(top_srcdir)/py-compile
-DATA = $(cts_DATA)
-
-DIST_COMMON = README $(cts_PYTHON) $(srcdir)/Makefile.in CIB.py.in \
-	CM_LinuxHAv2.py.in CM_fs.py.in CM_hb.py.in CTS.py.in \
-	CTSaudits.py.in CTSlab.py.in CTSproxy.py.in CTStests.py.in \
-	LSBDummy.in Makefile.am OCFIPraTest.py.in extracttests.py.in \
-	getpeinputs.sh.in
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  cts/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  cts/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-CM_fs.py: $(top_builddir)/config.status CM_fs.py.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+CM_fs.py: $(top_builddir)/config.status $(srcdir)/CM_fs.py.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-CM_hb.py: $(top_builddir)/config.status CM_hb.py.in
+CM_hb.py: $(top_builddir)/config.status $(srcdir)/CM_hb.py.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-CTS.py: $(top_builddir)/config.status CTS.py.in
+CTS.py: $(top_builddir)/config.status $(srcdir)/CTS.py.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-CTSaudits.py: $(top_builddir)/config.status CTSaudits.py.in
+CTSaudits.py: $(top_builddir)/config.status $(srcdir)/CTSaudits.py.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-CTSlab.py: $(top_builddir)/config.status CTSlab.py.in
+CTSlab.py: $(top_builddir)/config.status $(srcdir)/CTSlab.py.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-CTStests.py: $(top_builddir)/config.status CTStests.py.in
+CTStests.py: $(top_builddir)/config.status $(srcdir)/CTStests.py.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-CM_LinuxHAv2.py: $(top_builddir)/config.status CM_LinuxHAv2.py.in
+CM_LinuxHAv2.py: $(top_builddir)/config.status $(srcdir)/CM_LinuxHAv2.py.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-CTSproxy.py: $(top_builddir)/config.status CTSproxy.py.in
+CTSproxy.py: $(top_builddir)/config.status $(srcdir)/CTSproxy.py.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-extracttests.py: $(top_builddir)/config.status extracttests.py.in
+extracttests.py: $(top_builddir)/config.status $(srcdir)/extracttests.py.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-getpeinputs.sh: $(top_builddir)/config.status getpeinputs.sh.in
+getpeinputs.sh: $(top_builddir)/config.status $(srcdir)/getpeinputs.sh.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-OCFIPraTest.py: $(top_builddir)/config.status OCFIPraTest.py.in
+OCFIPraTest.py: $(top_builddir)/config.status $(srcdir)/OCFIPraTest.py.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-CIB.py: $(top_builddir)/config.status CIB.py.in
+CIB.py: $(top_builddir)/config.status $(srcdir)/CIB.py.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-LSBDummy: $(top_builddir)/config.status LSBDummy.in
+LSBDummy: $(top_builddir)/config.status $(srcdir)/LSBDummy.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-ctsSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 install-ctsSCRIPTS: $(cts_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(ctsdir)
+	test -z "$(ctsdir)" || $(MKDIR_P) "$(DESTDIR)$(ctsdir)"
 	@list='$(cts_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(ctsSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(ctsdir)/$$f"; \
-	    $(ctsSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(ctsdir)/$$f; \
+	    echo " $(ctsSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(ctsdir)/$$f'"; \
+	    $(ctsSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(ctsdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -455,8 +452,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(cts_SCRIPTS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f $(DESTDIR)$(ctsdir)/$$f"; \
-	  rm -f $(DESTDIR)$(ctsdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(ctsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(ctsdir)/$$f"; \
 	done
 
 mostlyclean-libtool:
@@ -464,50 +461,50 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-ctsPYTHON_INSTALL = $(INSTALL_DATA)
 install-ctsPYTHON: $(cts_PYTHON)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(ctsdir)
+	test -z "$(ctsdir)" || $(MKDIR_P) "$(DESTDIR)$(ctsdir)"
 	@list='$(cts_PYTHON)'; dlist=''; for p in $$list; do\
 	  if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
 	  if test -f $$b$$p; then \
-	    d=`echo "$$p" | sed -e 's,^.*/,,'`; \
-	    dlist="$$dlist $$d"; \
-	    echo " $(ctsPYTHON_INSTALL) $$b$$p $(DESTDIR)$(ctsdir)/$$d"; \
-	    $(ctsPYTHON_INSTALL) $$b$$p $(DESTDIR)$(ctsdir)/$$d; \
+	    f=$(am__strip_dir) \
+	    dlist="$$dlist $$f"; \
+	    echo " $(ctsPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(ctsdir)/$$f'"; \
+	    $(ctsPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(ctsdir)/$$f"; \
 	  else :; fi; \
 	done; \
-	PYTHON=$(PYTHON) $(py_compile) --basedir $(DESTDIR)$(ctsdir) $$dlist
+	if test -n "$$dlist"; then \
+	  if test -z "$(DESTDIR)"; then \
+	    PYTHON=$(PYTHON) $(py_compile) --basedir "$(ctsdir)" $$dlist; \
+	  else \
+	    PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(ctsdir)" $$dlist; \
+	  fi; \
+	else :; fi
 
 uninstall-ctsPYTHON:
 	@$(NORMAL_UNINSTALL)
-	list='$(cts_PYTHON)'; for p in $$list; do \
-	  d=`echo "$$p" | sed -e 's,^.*/,,'`; \
-	  rm -f $(DESTDIR)$(ctsdir)/$$d; \
-	  rm -f $(DESTDIR)$(ctsdir)/$${d}c; \
-	  rm -f $(DESTDIR)$(ctsdir)/$${d}o; \
+	@list='$(cts_PYTHON)'; dlist=''; for p in $$list; do\
+	  f=$(am__strip_dir) \
+	  rm -f "$(DESTDIR)$(ctsdir)/$$f"; \
+	  rm -f "$(DESTDIR)$(ctsdir)/$${f}c"; \
+	  rm -f "$(DESTDIR)$(ctsdir)/$${f}o"; \
 	done
-ctsDATA_INSTALL = $(INSTALL_DATA)
 install-ctsDATA: $(cts_DATA)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(ctsdir)
+	test -z "$(ctsdir)" || $(MKDIR_P) "$(DESTDIR)$(ctsdir)"
 	@list='$(cts_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(ctsDATA_INSTALL) $$d$$p $(DESTDIR)$(ctsdir)/$$f"; \
-	  $(ctsDATA_INSTALL) $$d$$p $(DESTDIR)$(ctsdir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " $(ctsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(ctsdir)/$$f'"; \
+	  $(ctsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(ctsdir)/$$f"; \
 	done
 
 uninstall-ctsDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(cts_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(ctsdir)/$$f"; \
-	  rm -f $(DESTDIR)$(ctsdir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(ctsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(ctsdir)/$$f"; \
 	done
 tags: TAGS
 TAGS:
@@ -515,28 +512,23 @@
 ctags: CTAGS
 CTAGS:
 
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -550,9 +542,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(SCRIPTS) $(DATA) all-local
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(ctsdir) $(DESTDIR)$(ctsdir) $(DESTDIR)$(ctsdir)
+	for dir in "$(DESTDIR)$(ctsdir)" "$(DESTDIR)$(ctsdir)" "$(DESTDIR)$(ctsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -572,7 +565,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -584,24 +577,34 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-ctsDATA install-ctsPYTHON install-ctsSCRIPTS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -620,20 +623,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-ctsDATA uninstall-ctsPYTHON uninstall-ctsSCRIPTS \
-	uninstall-info-am
+uninstall-am: uninstall-ctsDATA uninstall-ctsPYTHON \
+	uninstall-ctsSCRIPTS
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
 	clean-libtool clean-local distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am info info-am install \
-	install-am install-ctsDATA install-ctsPYTHON install-ctsSCRIPTS \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-ctsDATA uninstall-ctsPYTHON uninstall-ctsSCRIPTS \
-	uninstall-info-am
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-ctsDATA install-ctsPYTHON \
+	install-ctsSCRIPTS install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-ctsDATA uninstall-ctsPYTHON \
+	uninstall-ctsSCRIPTS
 
 
 all-local: $(cts_PYTHON)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,40 +30,55 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 @CRM_BUILD_TRUE@am__append_1 = cibadmin.8 crm_resource.8
+subdir = doc
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/cibadmin.8.in $(srcdir)/crm_resource.8.in \
+	$(srcdir)/startstop.in AUTHORS COPYING ChangeLog
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES = startstop cibadmin.8 crm_resource.8
+SOURCES =
+DIST_SOURCES =
+man1dir = $(mandir)/man1
+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" \
+	"$(DESTDIR)$(docdir)"
+man8dir = $(mandir)/man8
+NROFF = nroff
+MANS = $(man_MANS)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+docDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(doc_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -91,8 +101,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -136,8 +144,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -149,6 +155,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -156,12 +163,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -179,8 +182,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -189,15 +190,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -227,8 +225,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -249,8 +245,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -261,20 +255,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -282,17 +264,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -300,10 +284,10 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
-
 docdir = $(datadir)/doc/@HB_PKG@-@VERSION@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -322,6 +306,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -336,12 +321,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # doc: Linux-HA heartbeat code
@@ -363,7 +351,6 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 htmlfiles = HardwareGuide.html	\
 			GettingStarted.html	\
 			Requirements.html	\
@@ -372,52 +359,55 @@
 			heartbeat_api.html	\
 			rsync.html
 
-
 txtfiles = $(htmlfiles:.html=.txt)
-
 CLEANFILES = ChangeLog $(txtfiles)
-
 SPECSRC = $(top_builddir)/heartbeat.spec
-
 OTHER_DOCS = AUTHORS COPYING COPYING.LGPL ChangeLog \
                                 README authkeys ha.cf startstop haresources \
 				DirectoryMap.txt apphbd.cf logd.cf
 
-
 doc_DATA = $(OTHER_DOCS) $(txtfiles) $(htmlfiles) 
-
 man_MANS = heartbeat.8 apphbd.8 cl_status.1 ha_logd.8 ha_logger.1 \
-			 hb_standby.1 hb_takeover.1 hb_addnode.1 hb_delnode.1\
-$(am__append_1)
-
+	hb_standby.1 hb_takeover.1 hb_addnode.1 hb_delnode.1 \
+	$(am__append_1)
 EXTRA_DIST = $(txtfiles) $(htmlfiles) $(man_MANS) $(OTHER_DOCS)
-subdir = doc
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES = startstop cibadmin.8 crm_resource.8
-DIST_SOURCES =
-
-NROFF = nroff
-MANS = $(man_MANS)
-DATA = $(doc_DATA)
-
-DIST_COMMON = README $(srcdir)/Makefile.in AUTHORS COPYING ChangeLog \
-	Makefile.am cibadmin.8.in crm_resource.8.in startstop.in
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  doc/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-startstop: $(top_builddir)/config.status startstop.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+startstop: $(top_builddir)/config.status $(srcdir)/startstop.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-cibadmin.8: $(top_builddir)/config.status cibadmin.8.in
+cibadmin.8: $(top_builddir)/config.status $(srcdir)/cibadmin.8.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-crm_resource.8: $(top_builddir)/config.status crm_resource.8.in
+crm_resource.8: $(top_builddir)/config.status $(srcdir)/crm_resource.8.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 mostlyclean-libtool:
@@ -425,15 +415,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-man1dir = $(mandir)/man1
 install-man1: $(man1_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(man1dir)
+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
 	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
 	for i in $$l2; do \
@@ -452,8 +436,8 @@
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
 	done
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
@@ -473,14 +457,12 @@
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
-	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
+	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
 	done
-
-man8dir = $(mandir)/man8
 install-man8: $(man8_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(man8dir)
+	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
 	for i in $$l2; do \
@@ -499,8 +481,8 @@
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
 	done
 uninstall-man8:
 	@$(NORMAL_UNINSTALL)
@@ -520,26 +502,25 @@
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
-	  rm -f $(DESTDIR)$(man8dir)/$$inst; \
+	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
+	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
 	done
-docDATA_INSTALL = $(INSTALL_DATA)
 install-docDATA: $(doc_DATA)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(docdir)
+	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
 	@list='$(doc_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(docDATA_INSTALL) $$d$$p $(DESTDIR)$(docdir)/$$f"; \
-	  $(docDATA_INSTALL) $$d$$p $(DESTDIR)$(docdir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
+	  $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
 	done
 
 uninstall-docDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(doc_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(docdir)/$$f"; \
-	  rm -f $(DESTDIR)$(docdir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(docdir)/$$f"; \
 	done
 tags: TAGS
 TAGS:
@@ -547,28 +528,23 @@
 ctags: CTAGS
 CTAGS:
 
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -582,9 +558,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(MANS) $(DATA)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) $(DESTDIR)$(docdir)
+	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(docdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -605,7 +582,7 @@
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -617,24 +594,34 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-docDATA install-man
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man: install-man1 install-man8
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -653,20 +640,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-docDATA uninstall-info-am uninstall-man
+uninstall-am: uninstall-docDATA uninstall-man
 
 uninstall-man: uninstall-man1 uninstall-man8
 
+.MAKE: install-am install-strip
+
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-docDATA install-exec install-exec-am \
-	install-info install-info-am install-man install-man1 \
-	install-man8 install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am uninstall uninstall-am uninstall-docDATA \
-	uninstall-info-am uninstall-man uninstall-man1 uninstall-man8
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-docDATA install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-man1 install-man8 install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-docDATA uninstall-man uninstall-man1 uninstall-man8
 
 
 ChangeLog: $(SPECSRC)
--- a/fencing/Makefile.in
+++ b/fencing/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,17 +13,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +29,50 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = fencing
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +95,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +138,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +149,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +157,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +176,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +184,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +219,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +239,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +249,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +258,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +278,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +300,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +315,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 # Author: Sun Jiang Dong <sunjd@cn.ibm.com>
 # Copyright (c) 2004 International Business Machines
@@ -359,31 +343,39 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 SUBDIRS = stonithd test
-subdir = fencing
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-DIST_SUBDIRS = $(SUBDIRS)
 all: all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  fencing/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  fencing/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -391,10 +383,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -402,7 +390,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -414,15 +408,20 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -443,7 +442,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -454,14 +453,6 @@
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -470,19 +461,22 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -492,10 +486,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -518,28 +513,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -550,15 +540,19 @@
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -568,7 +562,6 @@
 all-am: Makefile
 installdirs: installdirs-recursive
 installdirs-am:
-
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -588,7 +581,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -600,25 +593,34 @@
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
+html: html-recursive
+
 info: info-recursive
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -637,26 +639,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
-	install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
-	install-recursive install-strip installcheck installcheck-am \
-	installdirs installdirs-am installdirs-recursive \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-recursive
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/fencing/stonithd/Makefile.in
+++ b/fencing/stonithd/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,62 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+halib_PROGRAMS = stonithd$(EXEEXT)
+subdir = fencing/stonithd
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(halibdir)"
+halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(halib_PROGRAMS)
+am_stonithd_OBJECTS = stonithd.$(OBJEXT)
+stonithd_OBJECTS = $(am_stonithd_OBJECTS)
+stonithd_LDADD = $(LDADD)
+stonithd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(stonithd_LDFLAGS) \
+	$(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(stonithd_SOURCES)
+DIST_SOURCES = $(stonithd_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +108,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +151,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +162,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +170,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +189,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +197,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +232,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +252,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +262,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +271,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +291,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +313,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +328,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #  File: Makefile.am
 #  Author: Sun Jiang Dong <sunjd@cn.ibm.com>
@@ -360,17 +357,14 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include  -I$(top_srcdir)/include     \
                    -I$(top_builddir)/libltdl  -I$(top_srcdir)/libltdl     \
 		   -I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha    \
 		   -I$(top_builddir)          -I$(top_srcdir)
 
-
 apigid = @HA_APIGID@
 halibdir = $(libdir)/@HB_PKG@
 havarlibdir = $(localstatedir)/lib/@HB_PKG@
-
 COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la   \
 		    $(top_builddir)/lib/hbclient/libhbclient.la  \
                     $(top_builddir)/lib/pils/libpils.la		\
@@ -378,64 +372,55 @@
 		    $(top_builddir)/lib/apphb/libapphb.la	\
 		    $(GLIBLIB)
 
-
-halib_PROGRAMS = stonithd
 stonithd_SOURCES = stonithd.c
 stonithd_LDFLAGS = $(COMMONLIBS) @LIBLTDL@  \
 		   $(top_builddir)/lib/fencing/libstonithd.la
 
-
 AM_CFLAGS = $(INCLUDES)
-subdir = fencing/stonithd
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-halib_PROGRAMS = stonithd$(EXEEXT)
-PROGRAMS = $(halib_PROGRAMS)
-
-am_stonithd_OBJECTS = stonithd.$(OBJEXT)
-stonithd_OBJECTS = $(am_stonithd_OBJECTS)
-stonithd_LDADD = $(LDADD)
-stonithd_DEPENDENCIES =
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/stonithd.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(stonithd_SOURCES)
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(stonithd_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  fencing/stonithd/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  fencing/stonithd/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-halibPROGRAMS: $(halib_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	test -z "$(halibdir)" || $(MKDIR_P) "$(DESTDIR)$(halibdir)"
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -443,8 +428,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(halibdir)/$$f"; \
-	  rm -f $(DESTDIR)$(halibdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(halibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(halibdir)/$$f"; \
 	done
 
 clean-halibPROGRAMS:
@@ -455,10 +440,10 @@
 	done
 stonithd$(EXEEXT): $(stonithd_OBJECTS) $(stonithd_DEPENDENCIES) 
 	@rm -f stonithd$(EXEEXT)
-	$(LINK) $(stonithd_LDFLAGS) $(stonithd_OBJECTS) $(stonithd_LDADD) $(LIBS)
+	$(stonithd_LINK) $(stonithd_OBJECTS) $(stonithd_LDADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -466,37 +451,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stonithd.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -504,18 +477,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -524,6 +485,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -535,10 +497,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -561,28 +524,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -596,9 +554,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	for dir in "$(DESTDIR)$(halibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -618,7 +577,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -626,30 +585,41 @@
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
-clean-am: clean-generic clean-halibPROGRAMS clean-libtool mostlyclean-am
+clean-am: clean-generic clean-halibPROGRAMS clean-libtool \
+	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-halibPROGRAMS
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-exec-local
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -670,20 +640,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-halibPROGRAMS uninstall-info-am
+uninstall-am: uninstall-halibPROGRAMS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-halibPROGRAMS clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-exec-local install-halibPROGRAMS \
-	install-info install-info-am install-man install-strip \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-exec-local \
+	install-halibPROGRAMS install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-halibPROGRAMS \
-	uninstall-info-am
+	tags uninstall uninstall-am uninstall-halibPROGRAMS
 
 
 # need to make stonithd's owner as hacluster:haclient?
--- a/fencing/test/Makefile.in
+++ b/fencing/test/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,12 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +31,65 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+apitest_PROGRAMS = apitest$(EXEEXT)
+subdir = fencing/test
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/STONITHDBasicSanityCheck.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES = STONITHDBasicSanityCheck
+am__installdirs = "$(DESTDIR)$(apitestdir)" "$(DESTDIR)$(testdir)"
+apitestPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(apitest_PROGRAMS)
+am_apitest_OBJECTS = apitest.$(OBJEXT)
+apitest_OBJECTS = $(am_apitest_OBJECTS)
+apitest_LDADD = $(LDADD)
+apitest_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(apitest_LDFLAGS) \
+	$(LDFLAGS) -o $@
+testSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(test_SCRIPTS)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(apitest_SOURCES)
+DIST_SOURCES = $(apitest_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +112,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +155,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +166,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +174,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +193,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +201,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +236,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +256,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +266,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +275,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +295,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +317,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +332,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #  File: Makefile.am
 #  Author: Sun Jiang Dong <sunjd@cn.ibm.com>
@@ -360,85 +361,70 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include  -I$(top_srcdir)/include     \
                    -I$(top_builddir)/libltdl  -I$(top_srcdir)/libltdl     \
 		   -I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha    \
 		   -I$(top_builddir)          -I$(top_srcdir)
 
-
 halibdir = $(libdir)/@HB_PKG@
 havarlibdir = $(localstatedir)/lib/@HB_PKG@
-
 COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la   \
 		    $(top_builddir)/lib/hbclient/libhbclient.la  \
                     $(top_builddir)/lib/fencing/libstonithd.la	 \
 		    $(GLIBLIB)
 
-
 apitestdir = $(HA_LIBHBDIR)/stonithdtest
 testdir = $(HA_NOARCHDATAHBDIR)/stonithdtest
 test_SCRIPTS = STONITHDBasicSanityCheck
 EXTRA_DIST = STONITHDBasicSanityCheck
-
-apitest_PROGRAMS = apitest
 apitest_SOURCES = apitest.c
 apitest_LDFLAGS = $(COMMONLIBS)
-subdir = fencing/test
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES = STONITHDBasicSanityCheck
-apitest_PROGRAMS = apitest$(EXEEXT)
-PROGRAMS = $(apitest_PROGRAMS)
-
-am_apitest_OBJECTS = apitest.$(OBJEXT)
-apitest_OBJECTS = $(am_apitest_OBJECTS)
-apitest_LDADD = $(LDADD)
-apitest_DEPENDENCIES =
-SCRIPTS = $(test_SCRIPTS)
-
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/apitest.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(apitest_SOURCES)
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am \
-	STONITHDBasicSanityCheck.in
-SOURCES = $(apitest_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  fencing/test/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  fencing/test/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-STONITHDBasicSanityCheck: $(top_builddir)/config.status STONITHDBasicSanityCheck.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+STONITHDBasicSanityCheck: $(top_builddir)/config.status $(srcdir)/STONITHDBasicSanityCheck.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-apitestPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-apitestPROGRAMS: $(apitest_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(apitestdir)
+	test -z "$(apitestdir)" || $(MKDIR_P) "$(DESTDIR)$(apitestdir)"
 	@list='$(apitest_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(apitestPROGRAMS_INSTALL) $$p $(DESTDIR)$(apitestdir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(apitestPROGRAMS_INSTALL) $$p $(DESTDIR)$(apitestdir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(apitestPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(apitestdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(apitestPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(apitestdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -446,8 +432,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(apitest_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(apitestdir)/$$f"; \
-	  rm -f $(DESTDIR)$(apitestdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(apitestdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(apitestdir)/$$f"; \
 	done
 
 clean-apitestPROGRAMS:
@@ -458,17 +444,16 @@
 	done
 apitest$(EXEEXT): $(apitest_OBJECTS) $(apitest_DEPENDENCIES) 
 	@rm -f apitest$(EXEEXT)
-	$(LINK) $(apitest_LDFLAGS) $(apitest_OBJECTS) $(apitest_LDADD) $(LIBS)
-testSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+	$(apitest_LINK) $(apitest_OBJECTS) $(apitest_LDADD) $(LIBS)
 install-testSCRIPTS: $(test_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(testdir)
+	test -z "$(testdir)" || $(MKDIR_P) "$(DESTDIR)$(testdir)"
 	@list='$(test_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(testSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(testdir)/$$f"; \
-	    $(testSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(testdir)/$$f; \
+	    echo " $(testSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(testdir)/$$f'"; \
+	    $(testSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(testdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -476,12 +461,12 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(test_SCRIPTS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f $(DESTDIR)$(testdir)/$$f"; \
-	  rm -f $(DESTDIR)$(testdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(testdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(testdir)/$$f"; \
 	done
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -489,37 +474,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/apitest.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -527,18 +500,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -547,6 +508,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -558,10 +520,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -584,28 +547,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -619,9 +577,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(SCRIPTS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(apitestdir) $(DESTDIR)$(testdir)
+	for dir in "$(DESTDIR)$(apitestdir)" "$(DESTDIR)$(testdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -641,7 +600,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -656,24 +615,34 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-apitestPROGRAMS install-testSCRIPTS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -694,21 +663,25 @@
 
 ps-am:
 
-uninstall-am: uninstall-apitestPROGRAMS uninstall-info-am \
-	uninstall-testSCRIPTS
+uninstall-am: uninstall-apitestPROGRAMS uninstall-testSCRIPTS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean \
 	clean-apitestPROGRAMS clean-generic clean-libtool ctags \
-	distclean distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-apitestPROGRAMS install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip install-testSCRIPTS installcheck \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am \
+	install-apitestPROGRAMS install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip install-testSCRIPTS installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-apitestPROGRAMS \
-	uninstall-info-am uninstall-testSCRIPTS
+	uninstall-testSCRIPTS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/heartbeat/Makefile.in
+++ b/heartbeat/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,14 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
+
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +33,100 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+halib_PROGRAMS = heartbeat$(EXEEXT) findif$(EXEEXT)
+subdir = heartbeat
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/shellfuncs.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES = shellfuncs
+am__installdirs = "$(DESTDIR)$(halibdir)" "$(DESTDIR)$(hadir)" \
+	"$(DESTDIR)$(hadir)"
+halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(halib_PROGRAMS)
+am_findif_OBJECTS = findif.$(OBJEXT)
+findif_OBJECTS = $(am_findif_OBJECTS)
+findif_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
+am_heartbeat_OBJECTS = heartbeat-heartbeat.$(OBJEXT) \
+	heartbeat-auth.$(OBJEXT) heartbeat-config.$(OBJEXT) \
+	heartbeat-ha_msg_internal.$(OBJEXT) heartbeat-hb_api.$(OBJEXT) \
+	heartbeat-hb_resource.$(OBJEXT) heartbeat-hb_signal.$(OBJEXT) \
+	heartbeat-module.$(OBJEXT) heartbeat-hb_uuid.$(OBJEXT) \
+	heartbeat-hb_rexmit.$(OBJEXT)
+heartbeat_OBJECTS = $(am_heartbeat_OBJECTS)
+am__DEPENDENCIES_1 =
+heartbeat_DEPENDENCIES = $(top_builddir)/lib/stonith/libstonith.la \
+	$(top_builddir)/lib/pils/libpils.la \
+	$(top_builddir)/lib/clplumbing/libplumb.la \
+	$(top_builddir)/lib/clplumbing/libplumbgpl.la \
+	$(top_builddir)/lib/apphb/libapphb.la \
+	$(top_builddir)/replace/libreplace.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+heartbeat_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(heartbeat_CFLAGS) \
+	$(CFLAGS) $(heartbeat_LDFLAGS) $(LDFLAGS) -o $@
+haSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(ha_SCRIPTS)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(findif_SOURCES) $(heartbeat_SOURCES)
+DIST_SOURCES = $(findif_SOURCES) $(heartbeat_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+haDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(ha_DATA)
+HEADERS = $(noinst_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +149,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +192,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +203,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +211,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -173,14 +225,11 @@
 LIBNETDEFINES = @LIBNETDEFINES@
 LIBNETLIBS = @LIBNETLIBS@
 LIBOBJS = @LIBOBJS@
-
 LIBRT = @LIBRT@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -189,15 +238,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -227,8 +273,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -249,8 +293,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -261,20 +303,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -282,17 +312,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -300,6 +332,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -321,6 +354,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -335,12 +369,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # heartbeat: Linux-HA heartbeat code
@@ -362,12 +399,10 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
 			-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
 			-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
 
-
 hadir = $(sysconfdir)/ha.d
 habindir = @bindir@
 halibdir = $(libdir)/@HB_PKG@
@@ -380,9 +415,7 @@
 apigid = @HA_APIGID@
 gliblib = @GLIBLIB@
 AM_CFLAGS = @CFLAGS@
-
 SUBDIRS = init.d lib logrotate.d rc.d libnet_util
-
 noinst_HEADERS = hb_config.h		\
 				hb_module.h		\
 				hb_proc.h		\
@@ -391,15 +424,11 @@
 				heartbeat_private.h	\
 				test.h
 
-
-halib_PROGRAMS = heartbeat findif
-
 heartbeat_SOURCES = heartbeat.c auth.c				\
 			config.c \
 			ha_msg_internal.c hb_api.c hb_resource.c	\
 			hb_signal.c module.c hb_uuid.c hb_rexmit.c
 
-
 heartbeat_LDADD = $(top_builddir)/lib/stonith/libstonith.la	\
 			$(top_builddir)/lib/pils/libpils.la		\
 			$(top_builddir)/lib/clplumbing/libplumb.la	\
@@ -408,107 +437,59 @@
 			$(top_builddir)/replace/libreplace.la		\
 			$(gliblib) $(LIBRT)
 
-
 heartbeat_LDFLAGS = @LIBADD_DL@ @LIBLTDL@ -export-dynamic	@DLOPEN_FORCE_FLAGS@
-
 heartbeat_CFLAGS = $(AM_CFLAGS)
-
 findif_SOURCES = findif.c
 findif_LDADD = $(top_builddir)/replace/libreplace.la
-
 ha_DATA = shellfuncs README.config 
 ha_SCRIPTS = harc
-
 EXTRA_DIST = $(ha_DATA) $(ha_SCRIPTS)
-subdir = heartbeat
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES = shellfuncs
-halib_PROGRAMS = heartbeat$(EXEEXT) findif$(EXEEXT)
-PROGRAMS = $(halib_PROGRAMS)
-
-am_findif_OBJECTS = findif.$(OBJEXT)
-findif_OBJECTS = $(am_findif_OBJECTS)
-findif_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
-findif_LDFLAGS =
-am_heartbeat_OBJECTS = heartbeat-heartbeat.$(OBJEXT) \
-	heartbeat-auth.$(OBJEXT) heartbeat-config.$(OBJEXT) \
-	heartbeat-ha_msg_internal.$(OBJEXT) heartbeat-hb_api.$(OBJEXT) \
-	heartbeat-hb_resource.$(OBJEXT) heartbeat-hb_signal.$(OBJEXT) \
-	heartbeat-module.$(OBJEXT) heartbeat-hb_uuid.$(OBJEXT) \
-	heartbeat-hb_rexmit.$(OBJEXT)
-heartbeat_OBJECTS = $(am_heartbeat_OBJECTS)
-heartbeat_DEPENDENCIES = $(top_builddir)/lib/stonith/libstonith.la \
-	$(top_builddir)/lib/pils/libpils.la \
-	$(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/clplumbing/libplumbgpl.la \
-	$(top_builddir)/lib/apphb/libapphb.la \
-	$(top_builddir)/replace/libreplace.la
-SCRIPTS = $(ha_SCRIPTS)
-
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/findif.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/heartbeat-auth.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/heartbeat-config.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/heartbeat-ha_msg_internal.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/heartbeat-hb_api.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/heartbeat-hb_resource.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/heartbeat-hb_rexmit.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/heartbeat-hb_signal.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/heartbeat-hb_uuid.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/heartbeat-heartbeat.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/heartbeat-module.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(findif_SOURCES) $(heartbeat_SOURCES)
-DATA = $(ha_DATA)
-
-HEADERS = $(noinst_HEADERS)
-
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am \
-	shellfuncs.in
-DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(findif_SOURCES) $(heartbeat_SOURCES)
-
 all: all-recursive
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  heartbeat/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  heartbeat/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-shellfuncs: $(top_builddir)/config.status shellfuncs.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+shellfuncs: $(top_builddir)/config.status $(srcdir)/shellfuncs.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-halibPROGRAMS: $(halib_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	test -z "$(halibdir)" || $(MKDIR_P) "$(DESTDIR)$(halibdir)"
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -516,8 +497,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(halibdir)/$$f"; \
-	  rm -f $(DESTDIR)$(halibdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(halibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(halibdir)/$$f"; \
 	done
 
 clean-halibPROGRAMS:
@@ -528,20 +509,19 @@
 	done
 findif$(EXEEXT): $(findif_OBJECTS) $(findif_DEPENDENCIES) 
 	@rm -f findif$(EXEEXT)
-	$(LINK) $(findif_LDFLAGS) $(findif_OBJECTS) $(findif_LDADD) $(LIBS)
+	$(LINK) $(findif_OBJECTS) $(findif_LDADD) $(LIBS)
 heartbeat$(EXEEXT): $(heartbeat_OBJECTS) $(heartbeat_DEPENDENCIES) 
 	@rm -f heartbeat$(EXEEXT)
-	$(LINK) $(heartbeat_LDFLAGS) $(heartbeat_OBJECTS) $(heartbeat_LDADD) $(LIBS)
-haSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+	$(heartbeat_LINK) $(heartbeat_OBJECTS) $(heartbeat_LDADD) $(LIBS)
 install-haSCRIPTS: $(ha_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(hadir)
+	test -z "$(hadir)" || $(MKDIR_P) "$(DESTDIR)$(hadir)"
 	@list='$(ha_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(haSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(hadir)/$$f"; \
-	    $(haSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(hadir)/$$f; \
+	    echo " $(haSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(hadir)/$$f'"; \
+	    $(haSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(hadir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -549,12 +529,12 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(ha_SCRIPTS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f $(DESTDIR)$(hadir)/$$f"; \
-	  rm -f $(DESTDIR)$(hadir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(hadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(hadir)/$$f"; \
 	done
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -572,394 +552,187 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/heartbeat-module.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 heartbeat-heartbeat.o: heartbeat.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-heartbeat.o -MD -MP -MF "$(DEPDIR)/heartbeat-heartbeat.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o heartbeat-heartbeat.o `test -f 'heartbeat.c' || echo '$(srcdir)/'`heartbeat.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/heartbeat-heartbeat.Tpo" "$(DEPDIR)/heartbeat-heartbeat.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/heartbeat-heartbeat.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-heartbeat.o -MD -MP -MF $(DEPDIR)/heartbeat-heartbeat.Tpo -c -o heartbeat-heartbeat.o `test -f 'heartbeat.c' || echo '$(srcdir)/'`heartbeat.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/heartbeat-heartbeat.Tpo $(DEPDIR)/heartbeat-heartbeat.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='heartbeat.c' object='heartbeat-heartbeat.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/heartbeat-heartbeat.Po' tmpdepfile='$(DEPDIR)/heartbeat-heartbeat.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -c -o heartbeat-heartbeat.o `test -f 'heartbeat.c' || echo '$(srcdir)/'`heartbeat.c
 
 heartbeat-heartbeat.obj: heartbeat.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-heartbeat.obj -MD -MP -MF "$(DEPDIR)/heartbeat-heartbeat.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o heartbeat-heartbeat.obj `if test -f 'heartbeat.c'; then $(CYGPATH_W) 'heartbeat.c'; else $(CYGPATH_W) '$(srcdir)/heartbeat.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/heartbeat-heartbeat.Tpo" "$(DEPDIR)/heartbeat-heartbeat.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/heartbeat-heartbeat.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-heartbeat.obj -MD -MP -MF $(DEPDIR)/heartbeat-heartbeat.Tpo -c -o heartbeat-heartbeat.obj `if test -f 'heartbeat.c'; then $(CYGPATH_W) 'heartbeat.c'; else $(CYGPATH_W) '$(srcdir)/heartbeat.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/heartbeat-heartbeat.Tpo $(DEPDIR)/heartbeat-heartbeat.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='heartbeat.c' object='heartbeat-heartbeat.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/heartbeat-heartbeat.Po' tmpdepfile='$(DEPDIR)/heartbeat-heartbeat.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -c -o heartbeat-heartbeat.obj `if test -f 'heartbeat.c'; then $(CYGPATH_W) 'heartbeat.c'; else $(CYGPATH_W) '$(srcdir)/heartbeat.c'; fi`
 
-heartbeat-heartbeat.lo: heartbeat.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-heartbeat.lo -MD -MP -MF "$(DEPDIR)/heartbeat-heartbeat.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o heartbeat-heartbeat.lo `test -f 'heartbeat.c' || echo '$(srcdir)/'`heartbeat.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/heartbeat-heartbeat.Tpo" "$(DEPDIR)/heartbeat-heartbeat.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/heartbeat-heartbeat.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='heartbeat.c' object='heartbeat-heartbeat.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/heartbeat-heartbeat.Plo' tmpdepfile='$(DEPDIR)/heartbeat-heartbeat.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -c -o heartbeat-heartbeat.lo `test -f 'heartbeat.c' || echo '$(srcdir)/'`heartbeat.c
-
 heartbeat-auth.o: auth.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-auth.o -MD -MP -MF "$(DEPDIR)/heartbeat-auth.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o heartbeat-auth.o `test -f 'auth.c' || echo '$(srcdir)/'`auth.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/heartbeat-auth.Tpo" "$(DEPDIR)/heartbeat-auth.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/heartbeat-auth.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-auth.o -MD -MP -MF $(DEPDIR)/heartbeat-auth.Tpo -c -o heartbeat-auth.o `test -f 'auth.c' || echo '$(srcdir)/'`auth.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/heartbeat-auth.Tpo $(DEPDIR)/heartbeat-auth.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='auth.c' object='heartbeat-auth.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/heartbeat-auth.Po' tmpdepfile='$(DEPDIR)/heartbeat-auth.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -c -o heartbeat-auth.o `test -f 'auth.c' || echo '$(srcdir)/'`auth.c
 
 heartbeat-auth.obj: auth.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-auth.obj -MD -MP -MF "$(DEPDIR)/heartbeat-auth.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o heartbeat-auth.obj `if test -f 'auth.c'; then $(CYGPATH_W) 'auth.c'; else $(CYGPATH_W) '$(srcdir)/auth.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/heartbeat-auth.Tpo" "$(DEPDIR)/heartbeat-auth.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/heartbeat-auth.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-auth.obj -MD -MP -MF $(DEPDIR)/heartbeat-auth.Tpo -c -o heartbeat-auth.obj `if test -f 'auth.c'; then $(CYGPATH_W) 'auth.c'; else $(CYGPATH_W) '$(srcdir)/auth.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/heartbeat-auth.Tpo $(DEPDIR)/heartbeat-auth.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='auth.c' object='heartbeat-auth.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/heartbeat-auth.Po' tmpdepfile='$(DEPDIR)/heartbeat-auth.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -c -o heartbeat-auth.obj `if test -f 'auth.c'; then $(CYGPATH_W) 'auth.c'; else $(CYGPATH_W) '$(srcdir)/auth.c'; fi`
 
-heartbeat-auth.lo: auth.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-auth.lo -MD -MP -MF "$(DEPDIR)/heartbeat-auth.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o heartbeat-auth.lo `test -f 'auth.c' || echo '$(srcdir)/'`auth.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/heartbeat-auth.Tpo" "$(DEPDIR)/heartbeat-auth.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/heartbeat-auth.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='auth.c' object='heartbeat-auth.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/heartbeat-auth.Plo' tmpdepfile='$(DEPDIR)/heartbeat-auth.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -c -o heartbeat-auth.lo `test -f 'auth.c' || echo '$(srcdir)/'`auth.c
-
 heartbeat-config.o: config.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-config.o -MD -MP -MF "$(DEPDIR)/heartbeat-config.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o heartbeat-config.o `test -f 'config.c' || echo '$(srcdir)/'`config.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/heartbeat-config.Tpo" "$(DEPDIR)/heartbeat-config.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/heartbeat-config.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-config.o -MD -MP -MF $(DEPDIR)/heartbeat-config.Tpo -c -o heartbeat-config.o `test -f 'config.c' || echo '$(srcdir)/'`config.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/heartbeat-config.Tpo $(DEPDIR)/heartbeat-config.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='config.c' object='heartbeat-config.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/heartbeat-config.Po' tmpdepfile='$(DEPDIR)/heartbeat-config.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -c -o heartbeat-config.o `test -f 'config.c' || echo '$(srcdir)/'`config.c
 
 heartbeat-config.obj: config.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-config.obj -MD -MP -MF "$(DEPDIR)/heartbeat-config.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o heartbeat-config.obj `if test -f 'config.c'; then $(CYGPATH_W) 'config.c'; else $(CYGPATH_W) '$(srcdir)/config.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/heartbeat-config.Tpo" "$(DEPDIR)/heartbeat-config.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/heartbeat-config.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-config.obj -MD -MP -MF $(DEPDIR)/heartbeat-config.Tpo -c -o heartbeat-config.obj `if test -f 'config.c'; then $(CYGPATH_W) 'config.c'; else $(CYGPATH_W) '$(srcdir)/config.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/heartbeat-config.Tpo $(DEPDIR)/heartbeat-config.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='config.c' object='heartbeat-config.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/heartbeat-config.Po' tmpdepfile='$(DEPDIR)/heartbeat-config.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -c -o heartbeat-config.obj `if test -f 'config.c'; then $(CYGPATH_W) 'config.c'; else $(CYGPATH_W) '$(srcdir)/config.c'; fi`
 
-heartbeat-config.lo: config.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-config.lo -MD -MP -MF "$(DEPDIR)/heartbeat-config.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o heartbeat-config.lo `test -f 'config.c' || echo '$(srcdir)/'`config.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/heartbeat-config.Tpo" "$(DEPDIR)/heartbeat-config.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/heartbeat-config.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='config.c' object='heartbeat-config.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/heartbeat-config.Plo' tmpdepfile='$(DEPDIR)/heartbeat-config.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -c -o heartbeat-config.lo `test -f 'config.c' || echo '$(srcdir)/'`config.c
-
 heartbeat-ha_msg_internal.o: ha_msg_internal.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-ha_msg_internal.o -MD -MP -MF "$(DEPDIR)/heartbeat-ha_msg_internal.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o heartbeat-ha_msg_internal.o `test -f 'ha_msg_internal.c' || echo '$(srcdir)/'`ha_msg_internal.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/heartbeat-ha_msg_internal.Tpo" "$(DEPDIR)/heartbeat-ha_msg_internal.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/heartbeat-ha_msg_internal.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-ha_msg_internal.o -MD -MP -MF $(DEPDIR)/heartbeat-ha_msg_internal.Tpo -c -o heartbeat-ha_msg_internal.o `test -f 'ha_msg_internal.c' || echo '$(srcdir)/'`ha_msg_internal.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/heartbeat-ha_msg_internal.Tpo $(DEPDIR)/heartbeat-ha_msg_internal.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ha_msg_internal.c' object='heartbeat-ha_msg_internal.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/heartbeat-ha_msg_internal.Po' tmpdepfile='$(DEPDIR)/heartbeat-ha_msg_internal.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -c -o heartbeat-ha_msg_internal.o `test -f 'ha_msg_internal.c' || echo '$(srcdir)/'`ha_msg_internal.c
 
 heartbeat-ha_msg_internal.obj: ha_msg_internal.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-ha_msg_internal.obj -MD -MP -MF "$(DEPDIR)/heartbeat-ha_msg_internal.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o heartbeat-ha_msg_internal.obj `if test -f 'ha_msg_internal.c'; then $(CYGPATH_W) 'ha_msg_internal.c'; else $(CYGPATH_W) '$(srcdir)/ha_msg_internal.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/heartbeat-ha_msg_internal.Tpo" "$(DEPDIR)/heartbeat-ha_msg_internal.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/heartbeat-ha_msg_internal.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-ha_msg_internal.obj -MD -MP -MF $(DEPDIR)/heartbeat-ha_msg_internal.Tpo -c -o heartbeat-ha_msg_internal.obj `if test -f 'ha_msg_internal.c'; then $(CYGPATH_W) 'ha_msg_internal.c'; else $(CYGPATH_W) '$(srcdir)/ha_msg_internal.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/heartbeat-ha_msg_internal.Tpo $(DEPDIR)/heartbeat-ha_msg_internal.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ha_msg_internal.c' object='heartbeat-ha_msg_internal.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/heartbeat-ha_msg_internal.Po' tmpdepfile='$(DEPDIR)/heartbeat-ha_msg_internal.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -c -o heartbeat-ha_msg_internal.obj `if test -f 'ha_msg_internal.c'; then $(CYGPATH_W) 'ha_msg_internal.c'; else $(CYGPATH_W) '$(srcdir)/ha_msg_internal.c'; fi`
 
-heartbeat-ha_msg_internal.lo: ha_msg_internal.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-ha_msg_internal.lo -MD -MP -MF "$(DEPDIR)/heartbeat-ha_msg_internal.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o heartbeat-ha_msg_internal.lo `test -f 'ha_msg_internal.c' || echo '$(srcdir)/'`ha_msg_internal.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/heartbeat-ha_msg_internal.Tpo" "$(DEPDIR)/heartbeat-ha_msg_internal.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/heartbeat-ha_msg_internal.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ha_msg_internal.c' object='heartbeat-ha_msg_internal.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/heartbeat-ha_msg_internal.Plo' tmpdepfile='$(DEPDIR)/heartbeat-ha_msg_internal.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -c -o heartbeat-ha_msg_internal.lo `test -f 'ha_msg_internal.c' || echo '$(srcdir)/'`ha_msg_internal.c
-
 heartbeat-hb_api.o: hb_api.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-hb_api.o -MD -MP -MF "$(DEPDIR)/heartbeat-hb_api.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o heartbeat-hb_api.o `test -f 'hb_api.c' || echo '$(srcdir)/'`hb_api.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/heartbeat-hb_api.Tpo" "$(DEPDIR)/heartbeat-hb_api.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/heartbeat-hb_api.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-hb_api.o -MD -MP -MF $(DEPDIR)/heartbeat-hb_api.Tpo -c -o heartbeat-hb_api.o `test -f 'hb_api.c' || echo '$(srcdir)/'`hb_api.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/heartbeat-hb_api.Tpo $(DEPDIR)/heartbeat-hb_api.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hb_api.c' object='heartbeat-hb_api.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/heartbeat-hb_api.Po' tmpdepfile='$(DEPDIR)/heartbeat-hb_api.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -c -o heartbeat-hb_api.o `test -f 'hb_api.c' || echo '$(srcdir)/'`hb_api.c
 
 heartbeat-hb_api.obj: hb_api.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-hb_api.obj -MD -MP -MF "$(DEPDIR)/heartbeat-hb_api.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o heartbeat-hb_api.obj `if test -f 'hb_api.c'; then $(CYGPATH_W) 'hb_api.c'; else $(CYGPATH_W) '$(srcdir)/hb_api.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/heartbeat-hb_api.Tpo" "$(DEPDIR)/heartbeat-hb_api.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/heartbeat-hb_api.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-hb_api.obj -MD -MP -MF $(DEPDIR)/heartbeat-hb_api.Tpo -c -o heartbeat-hb_api.obj `if test -f 'hb_api.c'; then $(CYGPATH_W) 'hb_api.c'; else $(CYGPATH_W) '$(srcdir)/hb_api.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/heartbeat-hb_api.Tpo $(DEPDIR)/heartbeat-hb_api.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hb_api.c' object='heartbeat-hb_api.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/heartbeat-hb_api.Po' tmpdepfile='$(DEPDIR)/heartbeat-hb_api.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -c -o heartbeat-hb_api.obj `if test -f 'hb_api.c'; then $(CYGPATH_W) 'hb_api.c'; else $(CYGPATH_W) '$(srcdir)/hb_api.c'; fi`
 
-heartbeat-hb_api.lo: hb_api.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-hb_api.lo -MD -MP -MF "$(DEPDIR)/heartbeat-hb_api.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o heartbeat-hb_api.lo `test -f 'hb_api.c' || echo '$(srcdir)/'`hb_api.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/heartbeat-hb_api.Tpo" "$(DEPDIR)/heartbeat-hb_api.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/heartbeat-hb_api.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hb_api.c' object='heartbeat-hb_api.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/heartbeat-hb_api.Plo' tmpdepfile='$(DEPDIR)/heartbeat-hb_api.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -c -o heartbeat-hb_api.lo `test -f 'hb_api.c' || echo '$(srcdir)/'`hb_api.c
-
 heartbeat-hb_resource.o: hb_resource.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-hb_resource.o -MD -MP -MF "$(DEPDIR)/heartbeat-hb_resource.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o heartbeat-hb_resource.o `test -f 'hb_resource.c' || echo '$(srcdir)/'`hb_resource.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/heartbeat-hb_resource.Tpo" "$(DEPDIR)/heartbeat-hb_resource.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/heartbeat-hb_resource.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-hb_resource.o -MD -MP -MF $(DEPDIR)/heartbeat-hb_resource.Tpo -c -o heartbeat-hb_resource.o `test -f 'hb_resource.c' || echo '$(srcdir)/'`hb_resource.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/heartbeat-hb_resource.Tpo $(DEPDIR)/heartbeat-hb_resource.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hb_resource.c' object='heartbeat-hb_resource.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/heartbeat-hb_resource.Po' tmpdepfile='$(DEPDIR)/heartbeat-hb_resource.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -c -o heartbeat-hb_resource.o `test -f 'hb_resource.c' || echo '$(srcdir)/'`hb_resource.c
 
 heartbeat-hb_resource.obj: hb_resource.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-hb_resource.obj -MD -MP -MF "$(DEPDIR)/heartbeat-hb_resource.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o heartbeat-hb_resource.obj `if test -f 'hb_resource.c'; then $(CYGPATH_W) 'hb_resource.c'; else $(CYGPATH_W) '$(srcdir)/hb_resource.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/heartbeat-hb_resource.Tpo" "$(DEPDIR)/heartbeat-hb_resource.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/heartbeat-hb_resource.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-hb_resource.obj -MD -MP -MF $(DEPDIR)/heartbeat-hb_resource.Tpo -c -o heartbeat-hb_resource.obj `if test -f 'hb_resource.c'; then $(CYGPATH_W) 'hb_resource.c'; else $(CYGPATH_W) '$(srcdir)/hb_resource.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/heartbeat-hb_resource.Tpo $(DEPDIR)/heartbeat-hb_resource.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hb_resource.c' object='heartbeat-hb_resource.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/heartbeat-hb_resource.Po' tmpdepfile='$(DEPDIR)/heartbeat-hb_resource.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -c -o heartbeat-hb_resource.obj `if test -f 'hb_resource.c'; then $(CYGPATH_W) 'hb_resource.c'; else $(CYGPATH_W) '$(srcdir)/hb_resource.c'; fi`
 
-heartbeat-hb_resource.lo: hb_resource.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-hb_resource.lo -MD -MP -MF "$(DEPDIR)/heartbeat-hb_resource.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o heartbeat-hb_resource.lo `test -f 'hb_resource.c' || echo '$(srcdir)/'`hb_resource.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/heartbeat-hb_resource.Tpo" "$(DEPDIR)/heartbeat-hb_resource.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/heartbeat-hb_resource.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hb_resource.c' object='heartbeat-hb_resource.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/heartbeat-hb_resource.Plo' tmpdepfile='$(DEPDIR)/heartbeat-hb_resource.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -c -o heartbeat-hb_resource.lo `test -f 'hb_resource.c' || echo '$(srcdir)/'`hb_resource.c
-
 heartbeat-hb_signal.o: hb_signal.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-hb_signal.o -MD -MP -MF "$(DEPDIR)/heartbeat-hb_signal.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o heartbeat-hb_signal.o `test -f 'hb_signal.c' || echo '$(srcdir)/'`hb_signal.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/heartbeat-hb_signal.Tpo" "$(DEPDIR)/heartbeat-hb_signal.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/heartbeat-hb_signal.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-hb_signal.o -MD -MP -MF $(DEPDIR)/heartbeat-hb_signal.Tpo -c -o heartbeat-hb_signal.o `test -f 'hb_signal.c' || echo '$(srcdir)/'`hb_signal.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/heartbeat-hb_signal.Tpo $(DEPDIR)/heartbeat-hb_signal.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hb_signal.c' object='heartbeat-hb_signal.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/heartbeat-hb_signal.Po' tmpdepfile='$(DEPDIR)/heartbeat-hb_signal.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -c -o heartbeat-hb_signal.o `test -f 'hb_signal.c' || echo '$(srcdir)/'`hb_signal.c
 
 heartbeat-hb_signal.obj: hb_signal.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-hb_signal.obj -MD -MP -MF "$(DEPDIR)/heartbeat-hb_signal.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o heartbeat-hb_signal.obj `if test -f 'hb_signal.c'; then $(CYGPATH_W) 'hb_signal.c'; else $(CYGPATH_W) '$(srcdir)/hb_signal.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/heartbeat-hb_signal.Tpo" "$(DEPDIR)/heartbeat-hb_signal.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/heartbeat-hb_signal.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-hb_signal.obj -MD -MP -MF $(DEPDIR)/heartbeat-hb_signal.Tpo -c -o heartbeat-hb_signal.obj `if test -f 'hb_signal.c'; then $(CYGPATH_W) 'hb_signal.c'; else $(CYGPATH_W) '$(srcdir)/hb_signal.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/heartbeat-hb_signal.Tpo $(DEPDIR)/heartbeat-hb_signal.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hb_signal.c' object='heartbeat-hb_signal.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/heartbeat-hb_signal.Po' tmpdepfile='$(DEPDIR)/heartbeat-hb_signal.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -c -o heartbeat-hb_signal.obj `if test -f 'hb_signal.c'; then $(CYGPATH_W) 'hb_signal.c'; else $(CYGPATH_W) '$(srcdir)/hb_signal.c'; fi`
 
-heartbeat-hb_signal.lo: hb_signal.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-hb_signal.lo -MD -MP -MF "$(DEPDIR)/heartbeat-hb_signal.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o heartbeat-hb_signal.lo `test -f 'hb_signal.c' || echo '$(srcdir)/'`hb_signal.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/heartbeat-hb_signal.Tpo" "$(DEPDIR)/heartbeat-hb_signal.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/heartbeat-hb_signal.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hb_signal.c' object='heartbeat-hb_signal.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/heartbeat-hb_signal.Plo' tmpdepfile='$(DEPDIR)/heartbeat-hb_signal.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -c -o heartbeat-hb_signal.lo `test -f 'hb_signal.c' || echo '$(srcdir)/'`hb_signal.c
-
 heartbeat-module.o: module.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-module.o -MD -MP -MF "$(DEPDIR)/heartbeat-module.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o heartbeat-module.o `test -f 'module.c' || echo '$(srcdir)/'`module.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/heartbeat-module.Tpo" "$(DEPDIR)/heartbeat-module.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/heartbeat-module.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-module.o -MD -MP -MF $(DEPDIR)/heartbeat-module.Tpo -c -o heartbeat-module.o `test -f 'module.c' || echo '$(srcdir)/'`module.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/heartbeat-module.Tpo $(DEPDIR)/heartbeat-module.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='module.c' object='heartbeat-module.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/heartbeat-module.Po' tmpdepfile='$(DEPDIR)/heartbeat-module.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -c -o heartbeat-module.o `test -f 'module.c' || echo '$(srcdir)/'`module.c
 
 heartbeat-module.obj: module.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-module.obj -MD -MP -MF "$(DEPDIR)/heartbeat-module.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o heartbeat-module.obj `if test -f 'module.c'; then $(CYGPATH_W) 'module.c'; else $(CYGPATH_W) '$(srcdir)/module.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/heartbeat-module.Tpo" "$(DEPDIR)/heartbeat-module.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/heartbeat-module.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-module.obj -MD -MP -MF $(DEPDIR)/heartbeat-module.Tpo -c -o heartbeat-module.obj `if test -f 'module.c'; then $(CYGPATH_W) 'module.c'; else $(CYGPATH_W) '$(srcdir)/module.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/heartbeat-module.Tpo $(DEPDIR)/heartbeat-module.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='module.c' object='heartbeat-module.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/heartbeat-module.Po' tmpdepfile='$(DEPDIR)/heartbeat-module.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -c -o heartbeat-module.obj `if test -f 'module.c'; then $(CYGPATH_W) 'module.c'; else $(CYGPATH_W) '$(srcdir)/module.c'; fi`
 
-heartbeat-module.lo: module.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-module.lo -MD -MP -MF "$(DEPDIR)/heartbeat-module.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o heartbeat-module.lo `test -f 'module.c' || echo '$(srcdir)/'`module.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/heartbeat-module.Tpo" "$(DEPDIR)/heartbeat-module.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/heartbeat-module.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='module.c' object='heartbeat-module.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/heartbeat-module.Plo' tmpdepfile='$(DEPDIR)/heartbeat-module.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -c -o heartbeat-module.lo `test -f 'module.c' || echo '$(srcdir)/'`module.c
-
 heartbeat-hb_uuid.o: hb_uuid.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-hb_uuid.o -MD -MP -MF "$(DEPDIR)/heartbeat-hb_uuid.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o heartbeat-hb_uuid.o `test -f 'hb_uuid.c' || echo '$(srcdir)/'`hb_uuid.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/heartbeat-hb_uuid.Tpo" "$(DEPDIR)/heartbeat-hb_uuid.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/heartbeat-hb_uuid.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-hb_uuid.o -MD -MP -MF $(DEPDIR)/heartbeat-hb_uuid.Tpo -c -o heartbeat-hb_uuid.o `test -f 'hb_uuid.c' || echo '$(srcdir)/'`hb_uuid.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/heartbeat-hb_uuid.Tpo $(DEPDIR)/heartbeat-hb_uuid.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hb_uuid.c' object='heartbeat-hb_uuid.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/heartbeat-hb_uuid.Po' tmpdepfile='$(DEPDIR)/heartbeat-hb_uuid.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -c -o heartbeat-hb_uuid.o `test -f 'hb_uuid.c' || echo '$(srcdir)/'`hb_uuid.c
 
 heartbeat-hb_uuid.obj: hb_uuid.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-hb_uuid.obj -MD -MP -MF "$(DEPDIR)/heartbeat-hb_uuid.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o heartbeat-hb_uuid.obj `if test -f 'hb_uuid.c'; then $(CYGPATH_W) 'hb_uuid.c'; else $(CYGPATH_W) '$(srcdir)/hb_uuid.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/heartbeat-hb_uuid.Tpo" "$(DEPDIR)/heartbeat-hb_uuid.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/heartbeat-hb_uuid.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-hb_uuid.obj -MD -MP -MF $(DEPDIR)/heartbeat-hb_uuid.Tpo -c -o heartbeat-hb_uuid.obj `if test -f 'hb_uuid.c'; then $(CYGPATH_W) 'hb_uuid.c'; else $(CYGPATH_W) '$(srcdir)/hb_uuid.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/heartbeat-hb_uuid.Tpo $(DEPDIR)/heartbeat-hb_uuid.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hb_uuid.c' object='heartbeat-hb_uuid.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/heartbeat-hb_uuid.Po' tmpdepfile='$(DEPDIR)/heartbeat-hb_uuid.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -c -o heartbeat-hb_uuid.obj `if test -f 'hb_uuid.c'; then $(CYGPATH_W) 'hb_uuid.c'; else $(CYGPATH_W) '$(srcdir)/hb_uuid.c'; fi`
 
-heartbeat-hb_uuid.lo: hb_uuid.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-hb_uuid.lo -MD -MP -MF "$(DEPDIR)/heartbeat-hb_uuid.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o heartbeat-hb_uuid.lo `test -f 'hb_uuid.c' || echo '$(srcdir)/'`hb_uuid.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/heartbeat-hb_uuid.Tpo" "$(DEPDIR)/heartbeat-hb_uuid.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/heartbeat-hb_uuid.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hb_uuid.c' object='heartbeat-hb_uuid.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/heartbeat-hb_uuid.Plo' tmpdepfile='$(DEPDIR)/heartbeat-hb_uuid.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -c -o heartbeat-hb_uuid.lo `test -f 'hb_uuid.c' || echo '$(srcdir)/'`hb_uuid.c
-
 heartbeat-hb_rexmit.o: hb_rexmit.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-hb_rexmit.o -MD -MP -MF "$(DEPDIR)/heartbeat-hb_rexmit.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o heartbeat-hb_rexmit.o `test -f 'hb_rexmit.c' || echo '$(srcdir)/'`hb_rexmit.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/heartbeat-hb_rexmit.Tpo" "$(DEPDIR)/heartbeat-hb_rexmit.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/heartbeat-hb_rexmit.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-hb_rexmit.o -MD -MP -MF $(DEPDIR)/heartbeat-hb_rexmit.Tpo -c -o heartbeat-hb_rexmit.o `test -f 'hb_rexmit.c' || echo '$(srcdir)/'`hb_rexmit.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/heartbeat-hb_rexmit.Tpo $(DEPDIR)/heartbeat-hb_rexmit.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hb_rexmit.c' object='heartbeat-hb_rexmit.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/heartbeat-hb_rexmit.Po' tmpdepfile='$(DEPDIR)/heartbeat-hb_rexmit.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -c -o heartbeat-hb_rexmit.o `test -f 'hb_rexmit.c' || echo '$(srcdir)/'`hb_rexmit.c
 
 heartbeat-hb_rexmit.obj: hb_rexmit.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-hb_rexmit.obj -MD -MP -MF "$(DEPDIR)/heartbeat-hb_rexmit.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o heartbeat-hb_rexmit.obj `if test -f 'hb_rexmit.c'; then $(CYGPATH_W) 'hb_rexmit.c'; else $(CYGPATH_W) '$(srcdir)/hb_rexmit.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/heartbeat-hb_rexmit.Tpo" "$(DEPDIR)/heartbeat-hb_rexmit.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/heartbeat-hb_rexmit.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-hb_rexmit.obj -MD -MP -MF $(DEPDIR)/heartbeat-hb_rexmit.Tpo -c -o heartbeat-hb_rexmit.obj `if test -f 'hb_rexmit.c'; then $(CYGPATH_W) 'hb_rexmit.c'; else $(CYGPATH_W) '$(srcdir)/hb_rexmit.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/heartbeat-hb_rexmit.Tpo $(DEPDIR)/heartbeat-hb_rexmit.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hb_rexmit.c' object='heartbeat-hb_rexmit.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/heartbeat-hb_rexmit.Po' tmpdepfile='$(DEPDIR)/heartbeat-hb_rexmit.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -c -o heartbeat-hb_rexmit.obj `if test -f 'hb_rexmit.c'; then $(CYGPATH_W) 'hb_rexmit.c'; else $(CYGPATH_W) '$(srcdir)/hb_rexmit.c'; fi`
 
-heartbeat-hb_rexmit.lo: hb_rexmit.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -MT heartbeat-hb_rexmit.lo -MD -MP -MF "$(DEPDIR)/heartbeat-hb_rexmit.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o heartbeat-hb_rexmit.lo `test -f 'hb_rexmit.c' || echo '$(srcdir)/'`hb_rexmit.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/heartbeat-hb_rexmit.Tpo" "$(DEPDIR)/heartbeat-hb_rexmit.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/heartbeat-hb_rexmit.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hb_rexmit.c' object='heartbeat-hb_rexmit.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/heartbeat-hb_rexmit.Plo' tmpdepfile='$(DEPDIR)/heartbeat-hb_rexmit.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(heartbeat_CFLAGS) $(CFLAGS) -c -o heartbeat-hb_rexmit.lo `test -f 'hb_rexmit.c' || echo '$(srcdir)/'`hb_rexmit.c
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-haDATA_INSTALL = $(INSTALL_DATA)
 install-haDATA: $(ha_DATA)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(hadir)
+	test -z "$(hadir)" || $(MKDIR_P) "$(DESTDIR)$(hadir)"
 	@list='$(ha_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(haDATA_INSTALL) $$d$$p $(DESTDIR)$(hadir)/$$f"; \
-	  $(haDATA_INSTALL) $$d$$p $(DESTDIR)$(hadir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " $(haDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(hadir)/$$f'"; \
+	  $(haDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(hadir)/$$f"; \
 	done
 
 uninstall-haDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(ha_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(hadir)/$$f"; \
-	  rm -f $(DESTDIR)$(hadir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(hadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(hadir)/$$f"; \
 	done
 
 # This directory's subdirectories are mostly independent; you can cd
@@ -969,7 +742,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -981,15 +760,20 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -1010,7 +794,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -1021,14 +805,6 @@
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -1037,19 +813,22 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -1059,10 +838,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -1085,28 +865,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -1117,15 +892,19 @@
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -1135,8 +914,9 @@
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) $(HEADERS)
 installdirs: installdirs-recursive
 installdirs-am:
-	$(mkinstalldirs) $(DESTDIR)$(halibdir) $(DESTDIR)$(hadir) $(DESTDIR)$(hadir)
-
+	for dir in "$(DESTDIR)$(halibdir)" "$(DESTDIR)$(hadir)" "$(DESTDIR)$(hadir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -1156,7 +936,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -1164,30 +944,42 @@
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-recursive
 
-clean-am: clean-generic clean-halibPROGRAMS clean-libtool mostlyclean-am
+clean-am: clean-generic clean-halibPROGRAMS clean-libtool \
+	mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
+html: html-recursive
+
 info: info-recursive
 
 info-am:
 
-install-data-am: install-haDATA install-haSCRIPTS install-halibPROGRAMS
+install-data-am: install-haDATA install-haSCRIPTS \
+	install-halibPROGRAMS
+
+install-dvi: install-dvi-recursive
 
 install-exec-am: install-exec-local
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -1209,29 +1001,28 @@
 ps-am:
 
 uninstall-am: uninstall-haDATA uninstall-haSCRIPTS \
-	uninstall-halibPROGRAMS uninstall-info-am uninstall-local
+	uninstall-halibPROGRAMS uninstall-local
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-halibPROGRAMS clean-libtool clean-recursive \
-	ctags ctags-recursive distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-recursive \
-	distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
-	info-recursive install install-am install-data install-data-am \
-	install-data-recursive install-exec install-exec-am \
-	install-exec-local install-exec-recursive install-haDATA \
-	install-haSCRIPTS install-halibPROGRAMS install-info \
-	install-info-am install-info-recursive install-man \
-	install-recursive install-strip installcheck installcheck-am \
-	installdirs installdirs-am installdirs-recursive \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
-	tags-recursive uninstall uninstall-am uninstall-haDATA \
-	uninstall-haSCRIPTS uninstall-halibPROGRAMS uninstall-info-am \
-	uninstall-info-recursive uninstall-local uninstall-recursive
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic \
+	clean-halibPROGRAMS clean-libtool ctags ctags-recursive \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-exec-local install-haDATA \
+	install-haSCRIPTS install-halibPROGRAMS install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-haDATA uninstall-haSCRIPTS \
+	uninstall-halibPROGRAMS uninstall-local
 
 
 # additional installations not covered normally
--- a/heartbeat/init.d/Makefile.in
+++ b/heartbeat/init.d/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,42 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = heartbeat/init.d
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/heartbeat.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES = heartbeat
+am__installdirs = "$(DESTDIR)$(initddir)"
+initdSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(initd_SCRIPTS)
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +88,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +131,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +142,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +150,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +169,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +177,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +212,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +232,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +242,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +251,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +271,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +293,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +308,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # heartbeat: Linux-HA heartbeat code
@@ -361,71 +338,72 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 initddir = @INITDIR@
-
 initd_SCRIPTS = heartbeat
-
 EXTRA_DIST = heartbeat.in
-subdir = heartbeat/init.d
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES = heartbeat
-SCRIPTS = $(initd_SCRIPTS)
-
-DIST_SOURCES =
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am heartbeat.in
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  heartbeat/init.d/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  heartbeat/init.d/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-heartbeat: $(top_builddir)/config.status heartbeat.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+heartbeat: $(top_builddir)/config.status $(srcdir)/heartbeat.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-initdSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
 ctags: CTAGS
 CTAGS:
 
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -439,9 +417,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(SCRIPTS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(initddir)
+	for dir in "$(DESTDIR)$(initddir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -461,7 +440,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -473,24 +452,34 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-initdSCRIPTS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -509,17 +498,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-initdSCRIPTS
+uninstall-am: uninstall-initdSCRIPTS
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-initdSCRIPTS install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am uninstall-initdSCRIPTS
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-initdSCRIPTS install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-initdSCRIPTS
 
 
 install-initdSCRIPTS: $(initd_SCRIPTS)
--- a/heartbeat/lib/Makefile.in
+++ b/heartbeat/lib/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,51 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = heartbeat/lib
+DIST_COMMON = $(srcdir)/BasicSanityCheck.in $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/ResourceManager.in \
+	$(srcdir)/TestHeartbeatComm.in $(srcdir)/ha_config.in \
+	$(srcdir)/ha_propagate.in $(srcdir)/hb_addnode.in \
+	$(srcdir)/hb_delnode.in $(srcdir)/hb_setsite.in \
+	$(srcdir)/hb_setweight.in $(srcdir)/hb_standby.in \
+	$(srcdir)/hb_takeover.in $(srcdir)/mach_down.in \
+	$(srcdir)/req_resource.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES = BasicSanityCheck ha_config ha_propagate \
+	hb_standby mach_down req_resource ResourceManager \
+	TestHeartbeatComm hb_takeover hb_addnode hb_delnode \
+	hb_setweight hb_setsite
+am__installdirs = "$(DESTDIR)$(halibdir)"
+halibSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(halib_SCRIPTS)
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +97,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +140,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +151,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +159,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +178,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +186,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +221,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +241,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +251,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +260,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +280,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +302,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +317,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # heartbeat: Linux-HA heartbeat code
@@ -368,66 +354,73 @@
 			BasicSanityCheck TestHeartbeatComm ha_config hb_takeover hb_addnode \
 			hb_delnode ha_propagate hb_setweight hb_setsite
 
-subdir = heartbeat/lib
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES = BasicSanityCheck ha_config ha_propagate hb_standby \
-	mach_down req_resource ResourceManager TestHeartbeatComm \
-	hb_takeover hb_addnode hb_delnode hb_setweight hb_setsite
-SCRIPTS = $(halib_SCRIPTS)
-
-DIST_SOURCES =
-DIST_COMMON = $(srcdir)/Makefile.in BasicSanityCheck.in Makefile.am \
-	ResourceManager.in TestHeartbeatComm.in ha_config.in \
-	ha_propagate.in hb_addnode.in hb_delnode.in hb_setsite.in \
-	hb_setweight.in hb_standby.in hb_takeover.in mach_down.in \
-	req_resource.in
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  heartbeat/lib/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  heartbeat/lib/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-BasicSanityCheck: $(top_builddir)/config.status BasicSanityCheck.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+BasicSanityCheck: $(top_builddir)/config.status $(srcdir)/BasicSanityCheck.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-ha_config: $(top_builddir)/config.status ha_config.in
+ha_config: $(top_builddir)/config.status $(srcdir)/ha_config.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-ha_propagate: $(top_builddir)/config.status ha_propagate.in
+ha_propagate: $(top_builddir)/config.status $(srcdir)/ha_propagate.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-hb_standby: $(top_builddir)/config.status hb_standby.in
+hb_standby: $(top_builddir)/config.status $(srcdir)/hb_standby.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-mach_down: $(top_builddir)/config.status mach_down.in
+mach_down: $(top_builddir)/config.status $(srcdir)/mach_down.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-req_resource: $(top_builddir)/config.status req_resource.in
+req_resource: $(top_builddir)/config.status $(srcdir)/req_resource.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-ResourceManager: $(top_builddir)/config.status ResourceManager.in
+ResourceManager: $(top_builddir)/config.status $(srcdir)/ResourceManager.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-TestHeartbeatComm: $(top_builddir)/config.status TestHeartbeatComm.in
+TestHeartbeatComm: $(top_builddir)/config.status $(srcdir)/TestHeartbeatComm.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-hb_takeover: $(top_builddir)/config.status hb_takeover.in
+hb_takeover: $(top_builddir)/config.status $(srcdir)/hb_takeover.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-hb_addnode: $(top_builddir)/config.status hb_addnode.in
+hb_addnode: $(top_builddir)/config.status $(srcdir)/hb_addnode.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-hb_delnode: $(top_builddir)/config.status hb_delnode.in
+hb_delnode: $(top_builddir)/config.status $(srcdir)/hb_delnode.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-hb_setweight: $(top_builddir)/config.status hb_setweight.in
+hb_setweight: $(top_builddir)/config.status $(srcdir)/hb_setweight.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-hb_setsite: $(top_builddir)/config.status hb_setsite.in
+hb_setsite: $(top_builddir)/config.status $(srcdir)/hb_setsite.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-halibSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 install-halibSCRIPTS: $(halib_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	test -z "$(halibdir)" || $(MKDIR_P) "$(DESTDIR)$(halibdir)"
 	@list='$(halib_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(halibSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(halibdir)/$$f"; \
-	    $(halibSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(halibdir)/$$f; \
+	    echo " $(halibSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	    $(halibSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(halibdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -435,8 +428,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(halib_SCRIPTS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f $(DESTDIR)$(halibdir)/$$f"; \
-	  rm -f $(DESTDIR)$(halibdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(halibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(halibdir)/$$f"; \
 	done
 
 mostlyclean-libtool:
@@ -444,38 +437,29 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
 ctags: CTAGS
 CTAGS:
 
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -489,9 +473,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(SCRIPTS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	for dir in "$(DESTDIR)$(halibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -511,7 +496,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -523,24 +508,34 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-halibSCRIPTS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -559,17 +554,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-halibSCRIPTS uninstall-info-am
+uninstall-am: uninstall-halibSCRIPTS
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am \
-	install-halibSCRIPTS install-info install-info-am install-man \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-halibSCRIPTS install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-halibSCRIPTS uninstall-info-am
+	uninstall uninstall-am uninstall-halibSCRIPTS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/heartbeat/libnet_util/Makefile.in
+++ b/heartbeat/libnet_util/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,61 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+halib_PROGRAMS = send_arp$(EXEEXT)
+subdir = heartbeat/libnet_util
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(halibdir)"
+halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(halib_PROGRAMS)
+am_send_arp_OBJECTS = send_arp.$(OBJEXT)
+send_arp_OBJECTS = $(am_send_arp_OBJECTS)
+am__DEPENDENCIES_1 =
+send_arp_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
+	$(am__DEPENDENCIES_1)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(send_arp_SOURCES)
+DIST_SOURCES = $(send_arp_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +107,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +150,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +161,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +169,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -173,14 +183,11 @@
 LIBNETDEFINES = @LIBNETDEFINES@
 LIBNETLIBS = @LIBNETLIBS@
 LIBOBJS = @LIBOBJS@
-
 LIBRT = @LIBRT@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -189,15 +196,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -227,8 +231,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -249,8 +251,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -261,20 +261,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -282,17 +270,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -300,6 +290,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -321,6 +312,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -335,12 +327,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # heartbeat: Linux-HA heartbeat code
@@ -362,72 +357,61 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
 			-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
 			-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
 
-
 halibdir = $(libdir)/@HB_PKG@
 gliblib = @GLIBLIB@
 AM_CFLAGS = @CFLAGS@ @LIBNETDEFINES@
-
-halib_PROGRAMS = send_arp
-
 send_arp_SOURCES = send_arp.c
 send_arp_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la	\
 			  $(gliblib) @LIBNETLIBS@
 
-subdir = heartbeat/libnet_util
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-halib_PROGRAMS = send_arp$(EXEEXT)
-PROGRAMS = $(halib_PROGRAMS)
-
-am_send_arp_OBJECTS = send_arp.$(OBJEXT)
-send_arp_OBJECTS = $(am_send_arp_OBJECTS)
-send_arp_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la
-send_arp_LDFLAGS =
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/send_arp.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(send_arp_SOURCES)
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(send_arp_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  heartbeat/libnet_util/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  heartbeat/libnet_util/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-halibPROGRAMS: $(halib_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	test -z "$(halibdir)" || $(MKDIR_P) "$(DESTDIR)$(halibdir)"
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -435,8 +419,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(halibdir)/$$f"; \
-	  rm -f $(DESTDIR)$(halibdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(halibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(halibdir)/$$f"; \
 	done
 
 clean-halibPROGRAMS:
@@ -447,10 +431,10 @@
 	done
 send_arp$(EXEEXT): $(send_arp_OBJECTS) $(send_arp_DEPENDENCIES) 
 	@rm -f send_arp$(EXEEXT)
-	$(LINK) $(send_arp_LDFLAGS) $(send_arp_OBJECTS) $(send_arp_LDADD) $(LIBS)
+	$(LINK) $(send_arp_OBJECTS) $(send_arp_LDADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -458,37 +442,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/send_arp.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -496,18 +468,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -516,6 +476,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -527,10 +488,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -553,28 +515,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -588,9 +545,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	for dir in "$(DESTDIR)$(halibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -610,7 +568,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -618,30 +576,41 @@
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
-clean-am: clean-generic clean-halibPROGRAMS clean-libtool mostlyclean-am
+clean-am: clean-generic clean-halibPROGRAMS clean-libtool \
+	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-halibPROGRAMS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -662,20 +631,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-halibPROGRAMS uninstall-info-am
+uninstall-am: uninstall-halibPROGRAMS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-halibPROGRAMS clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-halibPROGRAMS install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am \
+	install-halibPROGRAMS install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-halibPROGRAMS \
-	uninstall-info-am
+	tags uninstall uninstall-am uninstall-halibPROGRAMS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/heartbeat/logrotate.d/Makefile.in
+++ b/heartbeat/logrotate.d/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,47 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = heartbeat/logrotate.d
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(logrotateddir)"
+logrotatedDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(logrotated_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +93,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +136,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +147,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +155,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +174,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +182,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +217,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +237,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +247,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +256,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +276,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +298,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +313,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # heartbeat: Linux-HA heartbeat code
@@ -361,57 +343,63 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 logrotateddir = $(sysconfdir)/logrotate.d
-
 logrotated_DATA = heartbeat
-
 EXTRA_DIST = $(logrotated_DATA)
-subdir = heartbeat/logrotate.d
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(logrotated_DATA)
-
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  heartbeat/logrotate.d/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  heartbeat/logrotate.d/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-logrotatedDATA_INSTALL = $(INSTALL_DATA)
 install-logrotatedDATA: $(logrotated_DATA)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(logrotateddir)
+	test -z "$(logrotateddir)" || $(MKDIR_P) "$(DESTDIR)$(logrotateddir)"
 	@list='$(logrotated_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(logrotatedDATA_INSTALL) $$d$$p $(DESTDIR)$(logrotateddir)/$$f"; \
-	  $(logrotatedDATA_INSTALL) $$d$$p $(DESTDIR)$(logrotateddir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " $(logrotatedDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(logrotateddir)/$$f'"; \
+	  $(logrotatedDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(logrotateddir)/$$f"; \
 	done
 
 uninstall-logrotatedDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(logrotated_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(logrotateddir)/$$f"; \
-	  rm -f $(DESTDIR)$(logrotateddir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(logrotateddir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(logrotateddir)/$$f"; \
 	done
 tags: TAGS
 TAGS:
@@ -419,28 +407,23 @@
 ctags: CTAGS
 CTAGS:
 
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -454,9 +437,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(logrotateddir)
+	for dir in "$(DESTDIR)$(logrotateddir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -476,7 +460,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -488,24 +472,34 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-logrotatedDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -524,18 +518,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-logrotatedDATA
+uninstall-am: uninstall-logrotatedDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-logrotatedDATA install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-info-am \
-	uninstall-logrotatedDATA
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-logrotatedDATA \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am uninstall uninstall-am uninstall-logrotatedDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/heartbeat/rc.d/Makefile.in
+++ b/heartbeat/rc.d/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,42 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = heartbeat/rc.d
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/ask_resources.in $(srcdir)/hb_takeover.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES = ask_resources hb_takeover
+am__installdirs = "$(DESTDIR)$(harcddir)"
+harcdSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(harcd_SCRIPTS)
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +88,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +131,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +142,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +150,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +169,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +177,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +212,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +232,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +242,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +251,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +271,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +293,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +308,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # heartbeat: Linux-HA heartbeat code
@@ -361,47 +338,56 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 harcddir = $(sysconfdir)/ha.d/rc.d
-
 harcd_SCRIPTS = ip-request ip-request-resp status \
 			ask_resources hb_takeover
 
-
 EXTRA_DIST = $(harcd_SCRIPTS)
-subdir = heartbeat/rc.d
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES = ask_resources hb_takeover
-SCRIPTS = $(harcd_SCRIPTS)
-
-DIST_SOURCES =
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ask_resources.in \
-	hb_takeover.in
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  heartbeat/rc.d/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  heartbeat/rc.d/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-ask_resources: $(top_builddir)/config.status ask_resources.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ask_resources: $(top_builddir)/config.status $(srcdir)/ask_resources.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-hb_takeover: $(top_builddir)/config.status hb_takeover.in
+hb_takeover: $(top_builddir)/config.status $(srcdir)/hb_takeover.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-harcdSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 install-harcdSCRIPTS: $(harcd_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(harcddir)
+	test -z "$(harcddir)" || $(MKDIR_P) "$(DESTDIR)$(harcddir)"
 	@list='$(harcd_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(harcdSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(harcddir)/$$f"; \
-	    $(harcdSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(harcddir)/$$f; \
+	    echo " $(harcdSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(harcddir)/$$f'"; \
+	    $(harcdSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(harcddir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -409,8 +395,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(harcd_SCRIPTS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f $(DESTDIR)$(harcddir)/$$f"; \
-	  rm -f $(DESTDIR)$(harcddir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(harcddir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(harcddir)/$$f"; \
 	done
 
 mostlyclean-libtool:
@@ -418,38 +404,29 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
 ctags: CTAGS
 CTAGS:
 
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -463,9 +440,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(SCRIPTS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(harcddir)
+	for dir in "$(DESTDIR)$(harcddir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -485,7 +463,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -497,24 +475,34 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-harcdSCRIPTS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -533,17 +521,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-harcdSCRIPTS uninstall-info-am
+uninstall-am: uninstall-harcdSCRIPTS
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am \
-	install-harcdSCRIPTS install-info install-info-am install-man \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-harcdSCRIPTS install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-harcdSCRIPTS uninstall-info-am
+	uninstall uninstall-am uninstall-harcdSCRIPTS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -35,16 +35,11 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -56,39 +51,60 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = include
+DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/config.h.in $(srcdir)/hb_config.h.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = config.h hb_config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(includedir)"
+includeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(include_HEADERS) $(noinst_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -111,8 +127,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -156,8 +170,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -169,6 +181,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -176,12 +189,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -199,8 +208,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -209,15 +216,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -247,8 +251,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -269,8 +271,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -281,20 +281,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -302,17 +290,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -320,6 +310,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -333,7 +324,6 @@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-
 includedir = $(base_includedir)/heartbeat
 infodir = @infodir@
 install_sh = @install_sh@
@@ -342,6 +332,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -356,85 +347,86 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 MAINTAINERCLEANFILES = Makefile.in ha_version.h config.h.in
-
 EXTRA_DIST = ha_version.h
-
 noinst_HEADERS = hb_api_core.h config.h lha_internal.h ha_version.h
 include_HEADERS = apphb.h apphb_notify.h HBauth.h HBcomm.h	\
 			  ha_msg.h heartbeat.h hb_api.h	hb_config.h	\
 			  recoverymgr.h replace_uuid.h compress.h
 
-
 SUBDIRS = clplumbing ocf pils saf 			\
 			  stonith fencing lrm $(CRM_DIR) mgmt	
 
-
 HG_LIVE_VERSION = `$(HG) -R "$(top_srcdir)" id`
 ARCHIVE_VERSION = "$(top_srcdir)/.hg_archival.txt"
 HG_TAR_VERSION = `$(EGREP) node: "$(ARCHIVE_VERSION)"`
-subdir = include
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h hb_config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-HEADERS = $(include_HEADERS) $(noinst_HEADERS)
-
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive
-DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \
-	$(srcdir)/Makefile.in Makefile.am config.h.in hb_config.h.in
-DIST_SUBDIRS = $(SUBDIRS)
 all: config.h hb_config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  include/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 config.h: stamp-h1
 	@if test ! -f $@; then \
 	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
 	else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status include/config.h
-
-$(srcdir)/config.h.in:  $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/config.h.in:  $(am__configure_deps) 
 	cd $(top_srcdir) && $(AUTOHEADER)
-	touch $(srcdir)/config.h.in
+	rm -f stamp-h1
+	touch $@
 
 hb_config.h: stamp-h2
 	@if test ! -f $@; then \
 	  rm -f stamp-h2; \
-	  $(MAKE) stamp-h2; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h2; \
 	else :; fi
 
 stamp-h2: $(srcdir)/hb_config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h2
 	cd $(top_builddir) && $(SHELL) ./config.status include/hb_config.h
 
-$(srcdir)/hb_config.h.in:  $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	touch $(srcdir)/hb_config.h.in
-
 distclean-hdr:
 	-rm -f config.h stamp-h1 hb_config.h stamp-h2
 
@@ -443,27 +435,22 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
-	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
 	done
 
 uninstall-includeHEADERS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(include_HEADERS)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
-	  rm -f $(DESTDIR)$(includedir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
 	done
 
 # This directory's subdirectories are mostly independent; you can cd
@@ -473,7 +460,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -485,15 +478,20 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -514,7 +512,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -525,14 +523,6 @@
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -541,19 +531,22 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in hb_config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -563,10 +556,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in hb_config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -589,28 +583,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -621,15 +610,19 @@
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -639,8 +632,9 @@
 all-am: Makefile $(HEADERS) config.h hb_config.h
 installdirs: installdirs-recursive
 installdirs-am:
-	$(mkinstalldirs) $(DESTDIR)$(includedir)
-
+	for dir in "$(DESTDIR)$(includedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -660,7 +654,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -672,25 +666,34 @@
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
+html: html-recursive
+
 info: info-recursive
 
 info-am:
 
 install-data-am: install-includeHEADERS
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -709,26 +712,25 @@
 
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS uninstall-info-am
+uninstall-am: uninstall-includeHEADERS
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-hdr \
-	distclean-libtool distclean-recursive distclean-tags distdir \
-	dvi dvi-am dvi-recursive info info-am info-recursive install \
-	install-am install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-hdr distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
 	install-includeHEADERS install-info install-info-am \
-	install-info-recursive install-man install-recursive \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am installdirs-recursive maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
-	tags-recursive uninstall uninstall-am uninstall-includeHEADERS \
-	uninstall-info-am uninstall-info-recursive uninstall-recursive
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-includeHEADERS
 
 
 ha_version.h: $(ARCHIVE_VERSION)
--- a/include/clplumbing/Makefile.in
+++ b/include/clplumbing/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -34,16 +34,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -55,39 +50,50 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = include/clplumbing
+DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(includedir)"
+includeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(include_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -110,8 +116,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -155,8 +159,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -168,6 +170,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -175,12 +178,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -198,8 +197,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -208,15 +205,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -246,8 +240,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -268,8 +260,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -280,20 +270,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -301,17 +279,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -319,6 +299,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -332,7 +313,6 @@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-
 includedir = $(base_includedir)/clplumbing
 infodir = @infodir@
 install_sh = @install_sh@
@@ -341,6 +321,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -355,16 +336,18 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 include_HEADERS = \
 	Gmain_timeout.h	\
 	GSource.h	\
@@ -402,61 +385,62 @@
 	cl_quorum.h	\
 	cl_quorumd.h
 
-subdir = include/clplumbing
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-HEADERS = $(include_HEADERS)
-
-DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.in Makefile.am
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/clplumbing/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  include/clplumbing/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
-	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
 	done
 
 uninstall-includeHEADERS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(include_HEADERS)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
-	  rm -f $(DESTDIR)$(includedir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -465,6 +449,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -476,10 +461,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -502,28 +488,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -537,9 +518,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(HEADERS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	for dir in "$(DESTDIR)$(includedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -559,7 +541,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -571,25 +553,34 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-includeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -608,18 +599,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS uninstall-info-am
+uninstall-am: uninstall-includeHEADERS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool ctags distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-includeHEADERS \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-includeHEADERS uninstall-info-am
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am \
+	install-includeHEADERS install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags uninstall uninstall-am uninstall-includeHEADERS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -170,9 +170,6 @@
 /* Define to 1 if you have the `z' library (-lz). */
 #undef HAVE_LIBZ
 
-/* Define to 1 if you have the <linux/icmpv6.h> header file. */
-#undef HAVE_LINUX_ICMPV6_H
-
 /* Define to 1 if you have the <linux/watchdog.h> header file. */
 #undef HAVE_LINUX_WATCHDOG_H
 
@@ -194,6 +191,9 @@
 /* Define to 1 if you have the <ncurses/ncurses.h> header file. */
 #undef HAVE_NCURSES_NCURSES_H
 
+/* Define to 1 if you have the <netinet/icmp6.h> header file. */
+#undef HAVE_NETINET_ICMP6_H
+
 /* Define to 1 if you have the <netinet/in.h> header file. */
 #undef HAVE_NETINET_IN_H
 
--- a/include/crm/Makefile.in
+++ b/include/crm/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,60 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = include/crm
+DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(includedir)"
+includeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(include_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +106,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +149,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +160,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +168,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +187,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +195,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +230,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +250,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +260,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +269,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +289,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -312,7 +303,6 @@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-
 includedir = $(base_includedir)/heartbeat/crm
 infodir = @infodir@
 install_sh = @install_sh@
@@ -321,6 +311,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -335,12 +326,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # Copyright (C) 2004 Andrew Beekhof <andrew@beekhof.net>
@@ -360,62 +354,62 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 include_HEADERS = crm.h cib.h msg_xml.h transition.h
-
 SUBDIRS = common pengine
-subdir = include/crm
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-HEADERS = $(include_HEADERS)
-
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive
-DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.in Makefile.am
-DIST_SUBDIRS = $(SUBDIRS)
 all: all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/crm/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  include/crm/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
-	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
 	done
 
 uninstall-includeHEADERS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(include_HEADERS)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
-	  rm -f $(DESTDIR)$(includedir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
 	done
 
 # This directory's subdirectories are mostly independent; you can cd
@@ -425,7 +419,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -437,15 +437,20 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -466,7 +471,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -477,14 +482,6 @@
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -493,19 +490,22 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -515,10 +515,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -541,28 +542,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -573,15 +569,19 @@
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -591,8 +591,9 @@
 all-am: Makefile $(HEADERS)
 installdirs: installdirs-recursive
 installdirs-am:
-	$(mkinstalldirs) $(DESTDIR)$(includedir)
-
+	for dir in "$(DESTDIR)$(includedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -612,7 +613,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -624,25 +625,34 @@
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
+html: html-recursive
+
 info: info-recursive
 
 info-am:
 
 install-data-am: install-includeHEADERS
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -661,26 +671,25 @@
 
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS uninstall-info-am
+uninstall-am: uninstall-includeHEADERS
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
-	install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am \
 	install-includeHEADERS install-info install-info-am \
-	install-info-recursive install-man install-recursive \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am installdirs-recursive maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
-	tags-recursive uninstall uninstall-am uninstall-includeHEADERS \
-	uninstall-info-am uninstall-info-recursive uninstall-recursive
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-includeHEADERS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/include/crm/common/Makefile.in
+++ b/include/crm/common/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -32,16 +32,11 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -53,39 +48,50 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = include/crm/common
+DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(includedir)"
+includeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(include_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -108,8 +114,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -153,8 +157,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -166,6 +168,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -173,12 +176,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -196,8 +195,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -206,15 +203,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -244,8 +238,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -266,8 +258,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -278,20 +268,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -299,17 +277,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -317,6 +297,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -330,7 +311,6 @@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-
 includedir = $(base_includedir)/heartbeat/crm/common
 infodir = @infodir@
 install_sh = @install_sh@
@@ -339,6 +319,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -353,71 +334,73 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 MAINTAINERCLEANFILES = Makefile.in
-
 include_HEADERS = xml.h ipc.h msg.h ctrl.h util.h iso8601.h
-subdir = include/crm/common
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-HEADERS = $(include_HEADERS)
-
-DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.in Makefile.am
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/crm/common/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  include/crm/common/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
-	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
 	done
 
 uninstall-includeHEADERS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(include_HEADERS)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
-	  rm -f $(DESTDIR)$(includedir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -426,6 +409,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -437,10 +421,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -463,28 +448,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -498,9 +478,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(HEADERS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	for dir in "$(DESTDIR)$(includedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -520,7 +501,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -532,25 +513,34 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-includeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -569,18 +559,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS uninstall-info-am
+uninstall-am: uninstall-includeHEADERS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool ctags distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-includeHEADERS \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-includeHEADERS uninstall-info-am
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am \
+	install-includeHEADERS install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags uninstall uninstall-am uninstall-includeHEADERS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/include/crm/pengine/Makefile.in
+++ b/include/crm/pengine/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,50 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = include/crm/pengine
+DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(includedir)"
+includeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(include_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +96,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +139,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +150,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +158,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +177,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +185,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +220,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +240,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +250,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +259,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +279,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -312,7 +293,6 @@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-
 includedir = $(base_includedir)/heartbeat/crm/pengine
 infodir = @infodir@
 install_sh = @install_sh@
@@ -321,6 +301,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -335,12 +316,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # Copyright (C) 2004 Andrew Beekhof
@@ -360,63 +344,63 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 include_HEADERS = common.h complex.h rules.h status.h
-subdir = include/crm/pengine
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-HEADERS = $(include_HEADERS)
-
-DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.in Makefile.am
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/crm/pengine/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  include/crm/pengine/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
-	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
 	done
 
 uninstall-includeHEADERS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(include_HEADERS)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
-	  rm -f $(DESTDIR)$(includedir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -425,6 +409,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -436,10 +421,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -462,28 +448,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -497,9 +478,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(HEADERS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	for dir in "$(DESTDIR)$(includedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -519,7 +501,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -531,25 +513,34 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-includeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -568,18 +559,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS uninstall-info-am
+uninstall-am: uninstall-includeHEADERS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool ctags distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-includeHEADERS \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-includeHEADERS uninstall-info-am
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am \
+	install-includeHEADERS install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags uninstall uninstall-am uninstall-includeHEADERS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/include/fencing/Makefile.in
+++ b/include/fencing/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,50 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = include/fencing
+DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(includedir)"
+includeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(include_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +96,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +139,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +150,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +158,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +177,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +185,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +220,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +240,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +250,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +259,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +279,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -312,7 +293,6 @@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-
 includedir = $(base_includedir)/heartbeat/fencing
 infodir = @infodir@
 install_sh = @install_sh@
@@ -321,6 +301,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -335,12 +316,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # Author: Sun Jiang Dong <sunjd@cn.ibm.com>
@@ -361,63 +345,63 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 include_HEADERS = stonithd_api.h stonithd_msg.h
-subdir = include/fencing
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-HEADERS = $(include_HEADERS)
-
-DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.in Makefile.am
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/fencing/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  include/fencing/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
-	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
 	done
 
 uninstall-includeHEADERS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(include_HEADERS)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
-	  rm -f $(DESTDIR)$(includedir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -426,6 +410,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -437,10 +422,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -463,28 +449,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -498,9 +479,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(HEADERS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	for dir in "$(DESTDIR)$(includedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -520,7 +502,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -532,25 +514,34 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-includeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -569,18 +560,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS uninstall-info-am
+uninstall-am: uninstall-includeHEADERS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool ctags distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-includeHEADERS \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-includeHEADERS uninstall-info-am
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am \
+	install-includeHEADERS install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags uninstall uninstall-am uninstall-includeHEADERS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/include/lrm/Makefile.in
+++ b/include/lrm/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,50 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = include/lrm
+DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(includedir)"
+includeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(include_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +96,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +139,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +150,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +158,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +177,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +185,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +220,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +240,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +250,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +259,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +279,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -312,7 +293,6 @@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-
 includedir = $(base_includedir)/heartbeat/lrm
 infodir = @infodir@
 install_sh = @install_sh@
@@ -321,6 +301,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -335,12 +316,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # Author: Sun Jiang Dong <sunjd@cn.ibm.com>
@@ -361,63 +345,63 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 include_HEADERS = lrm_api.h lrm_msg.h racommon.h raexec.h
-subdir = include/lrm
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-HEADERS = $(include_HEADERS)
-
-DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.in Makefile.am
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/lrm/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  include/lrm/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
-	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
 	done
 
 uninstall-includeHEADERS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(include_HEADERS)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
-	  rm -f $(DESTDIR)$(includedir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -426,6 +410,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -437,10 +422,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -463,28 +449,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -498,9 +479,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(HEADERS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	for dir in "$(DESTDIR)$(includedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -520,7 +502,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -532,25 +514,34 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-includeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -569,18 +560,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS uninstall-info-am
+uninstall-am: uninstall-includeHEADERS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool ctags distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-includeHEADERS \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-includeHEADERS uninstall-info-am
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am \
+	install-includeHEADERS install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags uninstall uninstall-am uninstall-includeHEADERS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/include/mgmt/Makefile.in
+++ b/include/mgmt/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,50 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = include/mgmt
+DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(includedir)"
+includeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(include_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +96,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +139,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +150,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +158,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +177,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +185,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +220,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +240,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +250,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +259,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +279,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -312,7 +293,6 @@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-
 includedir = $(base_includedir)/heartbeat/mgmt
 infodir = @infodir@
 install_sh = @install_sh@
@@ -321,6 +301,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -335,12 +316,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # Author: Sun Jiang Dong <sunjd@cn.ibm.com>
@@ -361,68 +345,68 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 include_HEADERS = \
 		mgmt_client.h	\
 		mgmt_common.h	\
 		mgmt.h		\
 		mgmt_tls.h
 
-subdir = include/mgmt
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-HEADERS = $(include_HEADERS)
-
-DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.in Makefile.am
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/mgmt/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  include/mgmt/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
-	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
 	done
 
 uninstall-includeHEADERS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(include_HEADERS)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
-	  rm -f $(DESTDIR)$(includedir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -431,6 +415,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -442,10 +427,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -468,28 +454,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -503,9 +484,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(HEADERS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	for dir in "$(DESTDIR)$(includedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -525,7 +507,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -537,25 +519,34 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-includeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -574,18 +565,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS uninstall-info-am
+uninstall-am: uninstall-includeHEADERS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool ctags distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-includeHEADERS \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-includeHEADERS uninstall-info-am
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am \
+	install-includeHEADERS install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags uninstall uninstall-am uninstall-includeHEADERS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/include/ocf/Makefile.in
+++ b/include/ocf/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,50 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = include/ocf
+DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(includedir)"
+includeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(include_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +96,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +139,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +150,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +158,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +177,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +185,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +220,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +240,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +250,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +259,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +279,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -312,7 +293,6 @@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-
 includedir = $(base_includedir)/ocf
 infodir = @infodir@
 install_sh = @install_sh@
@@ -321,6 +301,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -335,12 +316,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # linux-ha: Linux-HA heartbeat code
@@ -365,66 +349,66 @@
 #
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 include_HEADERS = \
 	oc_event.h		\
 	oc_membership.h
 
-subdir = include/ocf
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-HEADERS = $(include_HEADERS)
-
-DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.in Makefile.am
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/ocf/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  include/ocf/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
-	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
 	done
 
 uninstall-includeHEADERS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(include_HEADERS)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
-	  rm -f $(DESTDIR)$(includedir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -433,6 +417,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -444,10 +429,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -470,28 +456,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -505,9 +486,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(HEADERS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	for dir in "$(DESTDIR)$(includedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -527,7 +509,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -539,25 +521,34 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-includeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -576,18 +567,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS uninstall-info-am
+uninstall-am: uninstall-includeHEADERS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool ctags distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-includeHEADERS \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-includeHEADERS uninstall-info-am
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am \
+	install-includeHEADERS install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags uninstall uninstall-am uninstall-includeHEADERS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/include/pils/Makefile.in
+++ b/include/pils/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,50 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = include/pils
+DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/plugin.h.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES = plugin.h
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(includedir)"
+includeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(include_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +96,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +139,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +150,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +158,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +177,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +185,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +220,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +240,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +250,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +259,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +279,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -312,7 +293,6 @@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-
 includedir = $(pils_includedir)
 infodir = @infodir@
 install_sh = @install_sh@
@@ -321,6 +301,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -335,12 +316,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # linux-ha: Linux-HA heartbeat code
@@ -363,28 +347,40 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 include_HEADERS = generic.h interface.h plugin.h
-subdir = include/pils
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES = plugin.h
-DIST_SOURCES =
-HEADERS = $(include_HEADERS)
-
-DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.in Makefile.am \
-	plugin.h.in
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/pils/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  include/pils/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-plugin.h: $(top_builddir)/config.status plugin.h.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+plugin.h: $(top_builddir)/config.status $(srcdir)/plugin.h.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 mostlyclean-libtool:
@@ -392,37 +388,24 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
-	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
 	done
 
 uninstall-includeHEADERS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(include_HEADERS)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
-	  rm -f $(DESTDIR)$(includedir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -431,6 +414,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -442,10 +426,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -468,28 +453,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -503,9 +483,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(HEADERS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	for dir in "$(DESTDIR)$(includedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -525,7 +506,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -537,25 +518,34 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-includeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -574,18 +564,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS uninstall-info-am
+uninstall-am: uninstall-includeHEADERS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool ctags distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-includeHEADERS \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-includeHEADERS uninstall-info-am
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am \
+	install-includeHEADERS install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags uninstall uninstall-am uninstall-includeHEADERS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/include/saf/Makefile.in
+++ b/include/saf/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,50 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = include/saf
+DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(includedir)"
+includeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(include_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +96,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +139,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +150,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +158,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +177,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +185,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +220,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +240,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +250,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +259,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +279,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -312,7 +293,6 @@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-
 includedir = @saf_includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -321,6 +301,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -335,12 +316,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # linux-ha: Linux-HA heartbeat code
@@ -363,63 +347,63 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 include_HEADERS = ais.h ais_amf.h ais_base.h ais_checkpoint.h ais_event.h ais_lock.h ais_membership.h ais_message.h
-subdir = include/saf
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-HEADERS = $(include_HEADERS)
-
-DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.in Makefile.am
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/saf/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  include/saf/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
-	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
 	done
 
 uninstall-includeHEADERS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(include_HEADERS)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
-	  rm -f $(DESTDIR)$(includedir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -428,6 +412,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -439,10 +424,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -465,28 +451,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -500,9 +481,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(HEADERS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	for dir in "$(DESTDIR)$(includedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -522,7 +504,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -534,25 +516,34 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-includeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -571,18 +562,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS uninstall-info-am
+uninstall-am: uninstall-includeHEADERS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool ctags distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-includeHEADERS \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-includeHEADERS uninstall-info-am
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am \
+	install-includeHEADERS install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags uninstall uninstall-am uninstall-includeHEADERS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/include/stonith/Makefile.in
+++ b/include/stonith/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,50 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = include/stonith
+DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(includedir)"
+includeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(include_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +96,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +139,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +150,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +158,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +177,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +185,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +220,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +240,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +250,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +259,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +279,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -312,7 +293,6 @@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-
 includedir = $(stonith_includedir)
 infodir = @infodir@
 install_sh = @install_sh@
@@ -321,6 +301,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -335,12 +316,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # linux-ha: Linux-HA heartbeat code
@@ -363,63 +347,63 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 include_HEADERS = expect.h stonith.h stonith_plugin.h st_ttylock.h
-subdir = include/stonith
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-HEADERS = $(include_HEADERS)
-
-DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.in Makefile.am
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/stonith/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  include/stonith/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
-	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
 	done
 
 uninstall-includeHEADERS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(include_HEADERS)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
-	  rm -f $(DESTDIR)$(includedir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -428,6 +412,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -439,10 +424,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -465,28 +451,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -500,9 +481,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(HEADERS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	for dir in "$(DESTDIR)$(includedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -522,7 +504,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -534,25 +516,34 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-includeHEADERS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -571,18 +562,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS uninstall-info-am
+uninstall-am: uninstall-includeHEADERS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool ctags distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-includeHEADERS \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-includeHEADERS uninstall-info-am
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am \
+	install-includeHEADERS install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags uninstall uninstall-am uninstall-includeHEADERS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/ldirectord/Makefile.in
+++ b/ldirectord/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,57 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = ldirectord
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/ldirectord.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES = ldirectord
+am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)"
+sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(sbin_SCRIPTS)
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+man8dir = $(mandir)/man8
+NROFF = nroff
+MANS = $(man_MANS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +103,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +146,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +157,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +165,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +184,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +192,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +227,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +247,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +257,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +266,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +286,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +308,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +323,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # ldirectord: Linux-HA heartbeat code
@@ -362,55 +354,54 @@
 #
 MAINTAINERCLEANFILES = Makefile.in
 CLEANFILES = ldirectord.8
-
 EXTRA_DIST = ldirectord ldirectord.cf README
-
 SUBDIRS = logrotate.d init.d OCF
-
 sbin_SCRIPTS = ldirectord
 man_MANS = ldirectord.8
-
 harddir = $(sysconfdir)/ha.d/resource.d
-subdir = ldirectord
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES = ldirectord
-SCRIPTS = $(sbin_SCRIPTS)
-
-DIST_SOURCES =
-
-NROFF = nroff
-MANS = $(man_MANS)
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive
-DIST_COMMON = README $(srcdir)/Makefile.in Makefile.am ldirectord.in
-DIST_SUBDIRS = $(SUBDIRS)
 all: all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  ldirectord/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  ldirectord/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-ldirectord: $(top_builddir)/config.status ldirectord.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ldirectord: $(top_builddir)/config.status $(srcdir)/ldirectord.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 install-sbinSCRIPTS: $(sbin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(sbindir)
+	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
 	@list='$(sbin_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(sbinSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(sbindir)/$$f"; \
-	    $(sbinSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(sbindir)/$$f; \
+	    echo " $(sbinSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+	    $(sbinSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(sbindir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -418,8 +409,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(sbin_SCRIPTS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \
-	  rm -f $(DESTDIR)$(sbindir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(sbindir)/$$f"; \
 	done
 
 mostlyclean-libtool:
@@ -427,15 +418,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-man8dir = $(mandir)/man8
 install-man8: $(man8_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(man8dir)
+	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
 	for i in $$l2; do \
@@ -454,8 +439,8 @@
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
 	done
 uninstall-man8:
 	@$(NORMAL_UNINSTALL)
@@ -475,8 +460,8 @@
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
-	  rm -f $(DESTDIR)$(man8dir)/$$inst; \
+	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
+	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
 	done
 
 # This directory's subdirectories are mostly independent; you can cd
@@ -486,7 +471,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -498,15 +489,20 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -527,7 +523,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -538,14 +534,6 @@
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -554,19 +542,22 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -576,10 +567,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -602,28 +594,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -634,15 +621,19 @@
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -652,8 +643,9 @@
 all-am: Makefile $(SCRIPTS) $(MANS)
 installdirs: installdirs-recursive
 installdirs-am:
-	$(mkinstalldirs) $(DESTDIR)$(sbindir) $(DESTDIR)$(man8dir)
-
+	for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -674,7 +666,7 @@
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -686,27 +678,36 @@
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
+html: html-recursive
+
 info: info-recursive
 
 info-am:
 
 install-data-am: install-man
 
+install-dvi: install-dvi-recursive
+
 install-exec-am: install-sbinSCRIPTS
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man: install-man8
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -725,31 +726,30 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-man uninstall-sbinSCRIPTS
+uninstall-am: uninstall-man uninstall-sbinSCRIPTS
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 
-uninstall-info: uninstall-info-recursive
-
 uninstall-man: uninstall-man8
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
-	install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
-	install-man8 install-recursive install-sbinSCRIPTS \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am installdirs-recursive maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
-	tags-recursive uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-man uninstall-man8 \
-	uninstall-recursive uninstall-sbinSCRIPTS
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-exec-am install-strip uninstall-am
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-exec-hook install-html install-html-am \
+	install-info install-info-am install-man install-man8 \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-sbinSCRIPTS install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-hook uninstall-man \
+	uninstall-man8 uninstall-sbinSCRIPTS
 
 
 ldirectord.8: ldirectord
--- a/ldirectord/OCF/Makefile.in
+++ b/ldirectord/OCF/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,42 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = ldirectord/OCF
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/ldirectord.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES = ldirectord
+am__installdirs = "$(DESTDIR)$(ocfdir)"
+ocfSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(ocf_SCRIPTS)
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +88,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +131,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +142,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +150,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +169,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +177,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +212,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +232,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +242,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +251,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +271,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +293,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +308,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # ldirectord: Linux-HA heartbeat code
@@ -361,42 +338,52 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 EXTRA_DIST = $(ocf_SCRIPTS)
-
 ocfdir = @OCF_RA_DIR@/heartbeat
-
 ocf_SCRIPTS = ldirectord
-subdir = ldirectord/OCF
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES = ldirectord
-SCRIPTS = $(ocf_SCRIPTS)
-
-DIST_SOURCES =
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ldirectord.in
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  ldirectord/OCF/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  ldirectord/OCF/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-ldirectord: $(top_builddir)/config.status ldirectord.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ldirectord: $(top_builddir)/config.status $(srcdir)/ldirectord.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-ocfSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 install-ocfSCRIPTS: $(ocf_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(ocfdir)
+	test -z "$(ocfdir)" || $(MKDIR_P) "$(DESTDIR)$(ocfdir)"
 	@list='$(ocf_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(ocfSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(ocfdir)/$$f"; \
-	    $(ocfSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(ocfdir)/$$f; \
+	    echo " $(ocfSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(ocfdir)/$$f'"; \
+	    $(ocfSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(ocfdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -404,8 +391,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(ocf_SCRIPTS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f $(DESTDIR)$(ocfdir)/$$f"; \
-	  rm -f $(DESTDIR)$(ocfdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(ocfdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(ocfdir)/$$f"; \
 	done
 
 mostlyclean-libtool:
@@ -413,38 +400,29 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
 ctags: CTAGS
 CTAGS:
 
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -458,9 +436,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(SCRIPTS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(ocfdir)
+	for dir in "$(DESTDIR)$(ocfdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -480,7 +459,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -492,24 +471,34 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-ocfSCRIPTS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -528,17 +517,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-ocfSCRIPTS
+uninstall-am: uninstall-ocfSCRIPTS
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-ocfSCRIPTS install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am uninstall-ocfSCRIPTS
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-ocfSCRIPTS \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-ocfSCRIPTS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/ldirectord/init.d/Makefile.in
+++ b/ldirectord/init.d/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,44 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = ldirectord/init.d
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/ldirectord.debian.default.in \
+	$(srcdir)/ldirectord.debian.in $(srcdir)/ldirectord.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES = ldirectord ldirectord.debian \
+	ldirectord.debian.default
+am__installdirs = "$(DESTDIR)$(initddir)"
+initdSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(initd_SCRIPTS)
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +90,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +133,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +144,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +152,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +171,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +179,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +214,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +234,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +244,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +253,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +273,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +295,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +310,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # ldirectord: Linux-HA heartbeat code
@@ -361,79 +340,78 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 initddir = @INITDIR@
-
 initd_SCRIPTS = ldirectord
-
 EXTRA_DIST = $(initd_SCRIPTS) \
 			  ldirectord.debian ldirectord.debian.default.in
 
-subdir = ldirectord/init.d
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES = ldirectord ldirectord.debian \
-	ldirectord.debian.default
-SCRIPTS = $(initd_SCRIPTS)
-
-DIST_SOURCES =
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am \
-	ldirectord.debian.default.in ldirectord.debian.in ldirectord.in
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  ldirectord/init.d/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  ldirectord/init.d/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-ldirectord: $(top_builddir)/config.status ldirectord.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ldirectord: $(top_builddir)/config.status $(srcdir)/ldirectord.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-ldirectord.debian: $(top_builddir)/config.status ldirectord.debian.in
+ldirectord.debian: $(top_builddir)/config.status $(srcdir)/ldirectord.debian.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-ldirectord.debian.default: $(top_builddir)/config.status ldirectord.debian.default.in
+ldirectord.debian.default: $(top_builddir)/config.status $(srcdir)/ldirectord.debian.default.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-initdSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
 ctags: CTAGS
 CTAGS:
 
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -447,9 +425,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(SCRIPTS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(initddir)
+	for dir in "$(DESTDIR)$(initddir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -469,7 +448,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -481,24 +460,34 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-initdSCRIPTS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -517,17 +506,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-initdSCRIPTS
+uninstall-am: uninstall-initdSCRIPTS
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-initdSCRIPTS install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am uninstall-initdSCRIPTS
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-initdSCRIPTS install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-initdSCRIPTS
 
 
 install-initdSCRIPTS: $(initd_SCRIPTS)
--- a/ldirectord/logrotate.d/Makefile.in
+++ b/ldirectord/logrotate.d/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,47 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = ldirectord/logrotate.d
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(logrotatedir)"
+logrotateDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(logrotate_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +93,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +136,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +147,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +155,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +174,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +182,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +217,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +237,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +247,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +256,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +276,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +298,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +313,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # ldirectord: Linux-HA heartbeat code
@@ -361,57 +343,63 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 EXTRA_DIST = ldirectord
-
 logrotatedir = $(sysconfdir)/logrotate.d
-
 logrotate_DATA = ldirectord
-subdir = ldirectord/logrotate.d
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(logrotate_DATA)
-
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  ldirectord/logrotate.d/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  ldirectord/logrotate.d/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-logrotateDATA_INSTALL = $(INSTALL_DATA)
 install-logrotateDATA: $(logrotate_DATA)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(logrotatedir)
+	test -z "$(logrotatedir)" || $(MKDIR_P) "$(DESTDIR)$(logrotatedir)"
 	@list='$(logrotate_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(logrotateDATA_INSTALL) $$d$$p $(DESTDIR)$(logrotatedir)/$$f"; \
-	  $(logrotateDATA_INSTALL) $$d$$p $(DESTDIR)$(logrotatedir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " $(logrotateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(logrotatedir)/$$f'"; \
+	  $(logrotateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(logrotatedir)/$$f"; \
 	done
 
 uninstall-logrotateDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(logrotate_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(logrotatedir)/$$f"; \
-	  rm -f $(DESTDIR)$(logrotatedir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(logrotatedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(logrotatedir)/$$f"; \
 	done
 tags: TAGS
 TAGS:
@@ -419,28 +407,23 @@
 ctags: CTAGS
 CTAGS:
 
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -454,9 +437,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(logrotatedir)
+	for dir in "$(DESTDIR)$(logrotatedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -476,7 +460,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -488,24 +472,34 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-logrotateDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -524,17 +518,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-logrotateDATA
+uninstall-am: uninstall-logrotateDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-logrotateDATA install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am uninstall-logrotateDATA
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-logrotateDATA install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-logrotateDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,17 +13,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +29,51 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = lib
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = pils stonith clplumbing hbclient apphb recoverymgr \
+	fencing plugins @CRM_DIR@ lrm mgmt
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +96,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +139,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +150,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +158,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +177,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +185,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +220,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +240,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +250,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +259,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +279,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +301,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +316,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # heartbeat library directory: Linux-HA code
@@ -362,7 +347,6 @@
 #
 MAINTAINERCLEANFILES = Makefile.in
 
-
 #
 #	PILS is supposed to be an independent library
 #	Stonith should rely only on PILS
@@ -372,7 +356,6 @@
 #
 #
 @MGMT_BUILD_TRUE@MGMT_DIR = mgmt
-
 SUBDIRS = \
 	pils			\
 	stonith 		\
@@ -386,30 +369,38 @@
 	lrm			\
 	$(MGMT_DIR)
 
-subdir = lib
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-DIST_SUBDIRS = pils stonith clplumbing hbclient apphb recoverymgr \
-	fencing plugins @CRM_DIR@ lrm mgmt
 all: all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -417,10 +408,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -428,7 +415,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -440,15 +433,20 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -469,7 +467,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -480,14 +478,6 @@
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -496,19 +486,22 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -518,10 +511,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -544,28 +538,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -578,13 +567,17 @@
 	done
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -594,7 +587,6 @@
 all-am: Makefile
 installdirs: installdirs-recursive
 installdirs-am:
-
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -614,7 +606,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -626,25 +618,34 @@
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
+html: html-recursive
+
 info: info-recursive
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -663,26 +664,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
-	install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
-	install-recursive install-strip installcheck installcheck-am \
-	installdirs installdirs-am installdirs-recursive \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-recursive
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/lib/apphb/Makefile.in
+++ b/lib/apphb/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,67 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = lib/apphb
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+libapphb_la_LIBADD =
+am_libapphb_la_OBJECTS = libapphb_la-apphb.lo
+libapphb_la_OBJECTS = $(am_libapphb_la_OBJECTS)
+libapphb_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libapphb_la_CFLAGS) \
+	$(CFLAGS) $(libapphb_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libapphb_la_SOURCES)
+DIST_SOURCES = $(libapphb_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +113,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +156,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +167,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +175,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +194,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +202,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +237,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +257,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +267,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +276,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +296,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +318,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +333,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # apphb: OCF application heartbeat library
@@ -361,91 +363,81 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
 			-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha  \
 			-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
 
-
 AM_CFLAGS = @CFLAGS@
-
 lib_LTLIBRARIES = libapphb.la
-
 libapphb_la_SOURCES = apphb.c	
 @ENABLE_THREAD_SAFE_FALSE@libapphb_la_CFLAGS = -lpthread
-
 @ENABLE_THREAD_SAFE_TRUE@libapphb_la_CFLAGS = -DTHREAD_SAFE -D_REENTRANT
-
 libapphb_la_LDFLAGS = -version-info 0:0:0 
-subdir = lib/apphb
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(lib_LTLIBRARIES)
-
-libapphb_la_LIBADD =
-am_libapphb_la_OBJECTS = libapphb_la-apphb.lo
-libapphb_la_OBJECTS = $(am_libapphb_la_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libapphb_la-apphb.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libapphb_la_SOURCES)
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(libapphb_la_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/apphb/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/apphb/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-libLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libapphb.la: $(libapphb_la_OBJECTS) $(libapphb_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libapphb_la_LDFLAGS) $(libapphb_la_OBJECTS) $(libapphb_la_LIBADD) $(LIBS)
+	$(libapphb_la_LINK) -rpath $(libdir) $(libapphb_la_OBJECTS) $(libapphb_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -453,70 +445,32 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libapphb_la-apphb.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-libapphb_la-apphb.o: apphb.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libapphb_la_CFLAGS) $(CFLAGS) -MT libapphb_la-apphb.o -MD -MP -MF "$(DEPDIR)/libapphb_la-apphb.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libapphb_la-apphb.o `test -f 'apphb.c' || echo '$(srcdir)/'`apphb.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libapphb_la-apphb.Tpo" "$(DEPDIR)/libapphb_la-apphb.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libapphb_la-apphb.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='apphb.c' object='libapphb_la-apphb.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libapphb_la-apphb.Po' tmpdepfile='$(DEPDIR)/libapphb_la-apphb.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libapphb_la_CFLAGS) $(CFLAGS) -c -o libapphb_la-apphb.o `test -f 'apphb.c' || echo '$(srcdir)/'`apphb.c
-
-libapphb_la-apphb.obj: apphb.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libapphb_la_CFLAGS) $(CFLAGS) -MT libapphb_la-apphb.obj -MD -MP -MF "$(DEPDIR)/libapphb_la-apphb.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libapphb_la-apphb.obj `if test -f 'apphb.c'; then $(CYGPATH_W) 'apphb.c'; else $(CYGPATH_W) '$(srcdir)/apphb.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libapphb_la-apphb.Tpo" "$(DEPDIR)/libapphb_la-apphb.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libapphb_la-apphb.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='apphb.c' object='libapphb_la-apphb.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libapphb_la-apphb.Po' tmpdepfile='$(DEPDIR)/libapphb_la-apphb.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libapphb_la_CFLAGS) $(CFLAGS) -c -o libapphb_la-apphb.obj `if test -f 'apphb.c'; then $(CYGPATH_W) 'apphb.c'; else $(CYGPATH_W) '$(srcdir)/apphb.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 libapphb_la-apphb.lo: apphb.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libapphb_la_CFLAGS) $(CFLAGS) -MT libapphb_la-apphb.lo -MD -MP -MF "$(DEPDIR)/libapphb_la-apphb.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libapphb_la-apphb.lo `test -f 'apphb.c' || echo '$(srcdir)/'`apphb.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libapphb_la-apphb.Tpo" "$(DEPDIR)/libapphb_la-apphb.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libapphb_la-apphb.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libapphb_la_CFLAGS) $(CFLAGS) -MT libapphb_la-apphb.lo -MD -MP -MF $(DEPDIR)/libapphb_la-apphb.Tpo -c -o libapphb_la-apphb.lo `test -f 'apphb.c' || echo '$(srcdir)/'`apphb.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libapphb_la-apphb.Tpo $(DEPDIR)/libapphb_la-apphb.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='apphb.c' object='libapphb_la-apphb.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libapphb_la-apphb.Plo' tmpdepfile='$(DEPDIR)/libapphb_la-apphb.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libapphb_la_CFLAGS) $(CFLAGS) -c -o libapphb_la-apphb.lo `test -f 'apphb.c' || echo '$(srcdir)/'`apphb.c
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libapphb_la_CFLAGS) $(CFLAGS) -c -o libapphb_la-apphb.lo `test -f 'apphb.c' || echo '$(srcdir)/'`apphb.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -524,18 +478,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -544,6 +486,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -555,10 +498,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -581,28 +525,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -616,9 +555,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	for dir in "$(DESTDIR)$(libdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -638,7 +578,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -653,24 +593,34 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -691,20 +641,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+uninstall-am: uninstall-libLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-strip installcheck \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-libLTLIBRARIES
+	tags uninstall uninstall-am uninstall-libLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/lib/clplumbing/Makefile.in
+++ b/lib/clplumbing/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,14 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
+
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +33,116 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+test_PROGRAMS = ipctest$(EXEEXT) ipctransientclient$(EXEEXT) \
+	ipctransientserver$(EXEEXT) base64_md5_test$(EXEEXT)
+subdir = lib/clplumbing
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(testdir)" \
+	"$(DESTDIR)$(testdir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+libplumb_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la \
+	$(top_builddir)/lib/pils/libpils.la
+am_libplumb_la_OBJECTS = base64.lo cl_compress.lo cl_log.lo \
+	cl_malloc.lo cl_misc.lo cl_msg.lo cl_msg_types.lo \
+	cl_netstring.lo cl_pidfile.lo cl_poll.lo cl_random.lo \
+	cl_signal.lo cl_syslog.lo cl_uuid.lo cl_plugin.lo cl_reboot.lo \
+	coredumps.lo cpulimits.lo Gmain_timeout.lo GSource.lo \
+	ipcsocket.lo longclock.lo md5.lo mkstemp_mode.lo ocf_ipc.lo \
+	proctrack.lo realtime.lo replytrack.lo timers.lo uids.lo
+libplumb_la_OBJECTS = $(am_libplumb_la_OBJECTS)
+libplumb_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libplumb_la_LDFLAGS) $(LDFLAGS) -o $@
+libplumbgpl_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la \
+	$(top_builddir)/lib/pils/libpils.la
+am_libplumbgpl_la_OBJECTS = setproctitle.lo
+libplumbgpl_la_OBJECTS = $(am_libplumbgpl_la_OBJECTS)
+libplumbgpl_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libplumbgpl_la_LDFLAGS) $(LDFLAGS) -o $@
+testPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(test_PROGRAMS)
+am_base64_md5_test_OBJECTS = base64_md5_test.$(OBJEXT)
+base64_md5_test_OBJECTS = $(am_base64_md5_test_OBJECTS)
+am__DEPENDENCIES_1 =
+base64_md5_test_DEPENDENCIES = libplumb.la \
+	$(top_builddir)/replace/libreplace.la $(am__DEPENDENCIES_1)
+am_ipctest_OBJECTS = ipctest.$(OBJEXT)
+ipctest_OBJECTS = $(am_ipctest_OBJECTS)
+ipctest_DEPENDENCIES = libplumb.la \
+	$(top_builddir)/replace/libreplace.la $(am__DEPENDENCIES_1) \
+	$(top_builddir)/lib/pils/libpils.la
+am_ipctransientclient_OBJECTS = ipctransientclient.$(OBJEXT) \
+	ipctransientlib.$(OBJEXT)
+ipctransientclient_OBJECTS = $(am_ipctransientclient_OBJECTS)
+ipctransientclient_DEPENDENCIES = libplumb.la \
+	$(top_builddir)/replace/libreplace.la $(am__DEPENDENCIES_1) \
+	$(top_builddir)/lib/pils/libpils.la
+am_ipctransientserver_OBJECTS = ipctransientserver.$(OBJEXT) \
+	ipctransientlib.$(OBJEXT)
+ipctransientserver_OBJECTS = $(am_ipctransientserver_OBJECTS)
+ipctransientserver_DEPENDENCIES = libplumb.la \
+	$(top_builddir)/replace/libreplace.la $(am__DEPENDENCIES_1) \
+	$(top_builddir)/lib/pils/libpils.la
+testSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(test_SCRIPTS)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libplumb_la_SOURCES) $(libplumbgpl_la_SOURCES) \
+	$(base64_md5_test_SOURCES) $(ipctest_SOURCES) \
+	$(ipctransientclient_SOURCES) $(ipctransientserver_SOURCES)
+DIST_SOURCES = $(libplumb_la_SOURCES) $(libplumbgpl_la_SOURCES) \
+	$(base64_md5_test_SOURCES) $(ipctest_SOURCES) \
+	$(ipctransientclient_SOURCES) $(ipctransientserver_SOURCES)
+HEADERS = $(noinst_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +165,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +208,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +219,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +227,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +246,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +254,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +289,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +309,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +319,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +328,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +348,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +370,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +385,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # plumbing: OCF general plumbing libraries
@@ -361,9 +415,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 halibdir = $(libdir)/@HB_PKG@
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
 			-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha  \
 			-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
@@ -372,9 +424,7 @@
 # if we want to do extreme stress test for messages, we need to disable IPC_TIME_DEBUG 
 # because there will be too many debug log about delayed messages 
 AM_CFLAGS = @CFLAGS@  -DALIGNFUNC=@ALIGN@ -DMSGHDR_TYPE=@MSGHDR_TYPE@
-
 lib_LTLIBRARIES = libplumb.la libplumbgpl.la
-
 libplumb_la_SOURCES = \
 			base64.c	\
 			cl_compress.c	\
@@ -407,197 +457,114 @@
 			timers.c	\
 			uids.c 	
 
-
 libplumb_la_LIBADD = $(top_builddir)/replace/libreplace.la \
 			$(top_builddir)/lib/pils/libpils.la
 
 libplumb_la_LDFLAGS = -version-info 1:0:0
-
 libplumbgpl_la_SOURCES = setproctitle.c
 libplumbgpl_la_LIBADD = $(top_builddir)/replace/libreplace.la \
 			$(top_builddir)/lib/pils/libpils.la
 
 libplumbgpl_la_LDFLAGS = -version-info 1:0:0
-
 testdir = $(libdir)/@HB_PKG@
-test_PROGRAMS = ipctest ipctransientclient ipctransientserver base64_md5_test
 test_SCRIPTS = transient-test.sh
-
 ipctest_SOURCES = ipctest.c
 ipctest_LDADD = libplumb.la $(top_builddir)/replace/libreplace.la $(GLIBLIB) \
 		$(top_builddir)/lib/pils/libpils.la
 
-
 noinst_HEADERS = ipctransient.h
 
-
 #ipctransient_SOURCES = ipctransient.c
 #ipctransient_LDADD = libplumb.la $(top_builddir)/replace/libreplace.la $(top_builddir)/heartbeat/libhbclient.la $(GLIBLIB)
 ipctransientclient_SOURCES = ipctransientclient.c ipctransientlib.c
 ipctransientclient_LDADD = libplumb.la $(top_builddir)/replace/libreplace.la $(GLIBLIB) \
 			$(top_builddir)/lib/pils/libpils.la
 
-
 ipctransientserver_SOURCES = ipctransientserver.c ipctransientlib.c
 ipctransientserver_LDADD = libplumb.la $(top_builddir)/replace/libreplace.la $(GLIBLIB) \
 			$(top_builddir)/lib/pils/libpils.la
 
 
-
 #netstring_test_SOURCES	= netstring_test.c
 #netstring_test_LDADD	= libplumb.la $(top_builddir)/replace/libreplace.la libhbclient.la $(gliblib)
 base64_md5_test_SOURCES = base64_md5_test.c
 base64_md5_test_LDADD = libplumb.la $(top_builddir)/replace/libreplace.la $(GLIBLIB)
-
 EXTRA_DIST = $(test_SCRIPTS)
-subdir = lib/clplumbing
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(lib_LTLIBRARIES)
-
-libplumb_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la \
-	$(top_builddir)/lib/pils/libpils.la
-am_libplumb_la_OBJECTS = base64.lo cl_compress.lo cl_log.lo cl_malloc.lo \
-	cl_misc.lo cl_msg.lo cl_msg_types.lo cl_netstring.lo \
-	cl_pidfile.lo cl_poll.lo cl_random.lo cl_signal.lo cl_syslog.lo \
-	cl_uuid.lo cl_plugin.lo cl_reboot.lo coredumps.lo cpulimits.lo \
-	Gmain_timeout.lo GSource.lo ipcsocket.lo longclock.lo md5.lo \
-	mkstemp_mode.lo ocf_ipc.lo proctrack.lo realtime.lo \
-	replytrack.lo timers.lo uids.lo
-libplumb_la_OBJECTS = $(am_libplumb_la_OBJECTS)
-libplumbgpl_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la \
-	$(top_builddir)/lib/pils/libpils.la
-am_libplumbgpl_la_OBJECTS = setproctitle.lo
-libplumbgpl_la_OBJECTS = $(am_libplumbgpl_la_OBJECTS)
-test_PROGRAMS = ipctest$(EXEEXT) ipctransientclient$(EXEEXT) \
-	ipctransientserver$(EXEEXT) base64_md5_test$(EXEEXT)
-PROGRAMS = $(test_PROGRAMS)
-
-am_base64_md5_test_OBJECTS = base64_md5_test.$(OBJEXT)
-base64_md5_test_OBJECTS = $(am_base64_md5_test_OBJECTS)
-base64_md5_test_DEPENDENCIES = libplumb.la \
-	$(top_builddir)/replace/libreplace.la
-base64_md5_test_LDFLAGS =
-am_ipctest_OBJECTS = ipctest.$(OBJEXT)
-ipctest_OBJECTS = $(am_ipctest_OBJECTS)
-ipctest_DEPENDENCIES = libplumb.la $(top_builddir)/replace/libreplace.la \
-	$(top_builddir)/lib/pils/libpils.la
-ipctest_LDFLAGS =
-am_ipctransientclient_OBJECTS = ipctransientclient.$(OBJEXT) \
-	ipctransientlib.$(OBJEXT)
-ipctransientclient_OBJECTS = $(am_ipctransientclient_OBJECTS)
-ipctransientclient_DEPENDENCIES = libplumb.la \
-	$(top_builddir)/replace/libreplace.la \
-	$(top_builddir)/lib/pils/libpils.la
-ipctransientclient_LDFLAGS =
-am_ipctransientserver_OBJECTS = ipctransientserver.$(OBJEXT) \
-	ipctransientlib.$(OBJEXT)
-ipctransientserver_OBJECTS = $(am_ipctransientserver_OBJECTS)
-ipctransientserver_DEPENDENCIES = libplumb.la \
-	$(top_builddir)/replace/libreplace.la \
-	$(top_builddir)/lib/pils/libpils.la
-ipctransientserver_LDFLAGS =
-SCRIPTS = $(test_SCRIPTS)
-
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/GSource.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/Gmain_timeout.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/base64.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/base64_md5_test.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/cl_compress.Plo ./$(DEPDIR)/cl_log.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/cl_malloc.Plo ./$(DEPDIR)/cl_misc.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/cl_msg.Plo ./$(DEPDIR)/cl_msg_types.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/cl_netstring.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/cl_pidfile.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/cl_plugin.Plo ./$(DEPDIR)/cl_poll.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/cl_random.Plo ./$(DEPDIR)/cl_reboot.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/cl_signal.Plo ./$(DEPDIR)/cl_syslog.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/cl_uuid.Plo ./$(DEPDIR)/coredumps.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/cpulimits.Plo ./$(DEPDIR)/ipcsocket.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/ipctest.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/ipctransientclient.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/ipctransientlib.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/ipctransientserver.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/longclock.Plo ./$(DEPDIR)/md5.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/mkstemp_mode.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/ocf_ipc.Plo ./$(DEPDIR)/proctrack.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/realtime.Plo ./$(DEPDIR)/replytrack.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/setproctitle.Plo ./$(DEPDIR)/timers.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/uids.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libplumb_la_SOURCES) $(libplumbgpl_la_SOURCES) \
-	$(base64_md5_test_SOURCES) $(ipctest_SOURCES) \
-	$(ipctransientclient_SOURCES) $(ipctransientserver_SOURCES)
-HEADERS = $(noinst_HEADERS)
-
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(libplumb_la_SOURCES) $(libplumbgpl_la_SOURCES) $(base64_md5_test_SOURCES) $(ipctest_SOURCES) $(ipctransientclient_SOURCES) $(ipctransientserver_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/clplumbing/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/clplumbing/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-libLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libplumb.la: $(libplumb_la_OBJECTS) $(libplumb_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libplumb_la_LDFLAGS) $(libplumb_la_OBJECTS) $(libplumb_la_LIBADD) $(LIBS)
+	$(libplumb_la_LINK) -rpath $(libdir) $(libplumb_la_OBJECTS) $(libplumb_la_LIBADD) $(LIBS)
 libplumbgpl.la: $(libplumbgpl_la_OBJECTS) $(libplumbgpl_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libplumbgpl_la_LDFLAGS) $(libplumbgpl_la_OBJECTS) $(libplumbgpl_la_LIBADD) $(LIBS)
-testPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+	$(libplumbgpl_la_LINK) -rpath $(libdir) $(libplumbgpl_la_OBJECTS) $(libplumbgpl_la_LIBADD) $(LIBS)
 install-testPROGRAMS: $(test_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(testdir)
+	test -z "$(testdir)" || $(MKDIR_P) "$(DESTDIR)$(testdir)"
 	@list='$(test_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(testPROGRAMS_INSTALL) $$p $(DESTDIR)$(testdir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(testPROGRAMS_INSTALL) $$p $(DESTDIR)$(testdir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(testPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(testdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(testPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(testdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -605,8 +572,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(test_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(testdir)/$$f"; \
-	  rm -f $(DESTDIR)$(testdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(testdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(testdir)/$$f"; \
 	done
 
 clean-testPROGRAMS:
@@ -617,26 +584,25 @@
 	done
 base64_md5_test$(EXEEXT): $(base64_md5_test_OBJECTS) $(base64_md5_test_DEPENDENCIES) 
 	@rm -f base64_md5_test$(EXEEXT)
-	$(LINK) $(base64_md5_test_LDFLAGS) $(base64_md5_test_OBJECTS) $(base64_md5_test_LDADD) $(LIBS)
+	$(LINK) $(base64_md5_test_OBJECTS) $(base64_md5_test_LDADD) $(LIBS)
 ipctest$(EXEEXT): $(ipctest_OBJECTS) $(ipctest_DEPENDENCIES) 
 	@rm -f ipctest$(EXEEXT)
-	$(LINK) $(ipctest_LDFLAGS) $(ipctest_OBJECTS) $(ipctest_LDADD) $(LIBS)
+	$(LINK) $(ipctest_OBJECTS) $(ipctest_LDADD) $(LIBS)
 ipctransientclient$(EXEEXT): $(ipctransientclient_OBJECTS) $(ipctransientclient_DEPENDENCIES) 
 	@rm -f ipctransientclient$(EXEEXT)
-	$(LINK) $(ipctransientclient_LDFLAGS) $(ipctransientclient_OBJECTS) $(ipctransientclient_LDADD) $(LIBS)
+	$(LINK) $(ipctransientclient_OBJECTS) $(ipctransientclient_LDADD) $(LIBS)
 ipctransientserver$(EXEEXT): $(ipctransientserver_OBJECTS) $(ipctransientserver_DEPENDENCIES) 
 	@rm -f ipctransientserver$(EXEEXT)
-	$(LINK) $(ipctransientserver_LDFLAGS) $(ipctransientserver_OBJECTS) $(ipctransientserver_LDADD) $(LIBS)
-testSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+	$(LINK) $(ipctransientserver_OBJECTS) $(ipctransientserver_LDADD) $(LIBS)
 install-testSCRIPTS: $(test_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(testdir)
+	test -z "$(testdir)" || $(MKDIR_P) "$(DESTDIR)$(testdir)"
 	@list='$(test_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(testSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(testdir)/$$f"; \
-	    $(testSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(testdir)/$$f; \
+	    echo " $(testSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(testdir)/$$f'"; \
+	    $(testSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(testdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -644,12 +610,12 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(test_SCRIPTS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f $(DESTDIR)$(testdir)/$$f"; \
-	  rm -f $(DESTDIR)$(testdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(testdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(testdir)/$$f"; \
 	done
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -692,37 +658,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uids.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -730,18 +684,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -750,6 +692,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -761,10 +704,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -787,28 +731,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -822,9 +761,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(HEADERS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(testdir) $(DESTDIR)$(testdir)
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(testdir)" "$(DESTDIR)$(testdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -844,7 +784,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -859,24 +799,34 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-testPROGRAMS install-testSCRIPTS
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -897,23 +847,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
-	uninstall-testPROGRAMS uninstall-testSCRIPTS
+uninstall-am: uninstall-libLTLIBRARIES uninstall-testPROGRAMS \
+	uninstall-testSCRIPTS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool clean-testPROGRAMS ctags \
-	distclean distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-strip \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	install-testPROGRAMS install-testSCRIPTS installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-libLTLIBRARIES uninstall-testPROGRAMS \
-	uninstall-testSCRIPTS
+	tags uninstall uninstall-am uninstall-libLTLIBRARIES \
+	uninstall-testPROGRAMS uninstall-testSCRIPTS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/lib/crm/Makefile.in
+++ b/lib/crm/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,17 +13,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +29,49 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = lib/crm
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +94,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +137,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +148,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +156,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +175,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +183,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +218,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +238,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +248,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +257,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +277,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +299,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +314,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # Copyright (C) 2004 Andrew Beekhof
@@ -359,31 +342,40 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 SUBDIRS = common pengine cib transition
 DIST_SUBDIRS = common pengine cib transition
-subdir = lib/crm
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
 all: all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/crm/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/crm/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -391,10 +383,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -402,7 +390,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -414,15 +408,20 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -443,7 +442,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -454,14 +453,6 @@
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -470,19 +461,22 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -492,10 +486,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -518,28 +513,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -552,13 +542,17 @@
 	done
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -568,7 +562,6 @@
 all-am: Makefile
 installdirs: installdirs-recursive
 installdirs-am:
-
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -588,7 +581,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -600,25 +593,34 @@
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
+html: html-recursive
+
 info: info-recursive
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -637,26 +639,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
-	install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
-	install-recursive install-strip installcheck installcheck-am \
-	installdirs installdirs-am installdirs-recursive \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-recursive
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/lib/crm/cib/Makefile.in
+++ b/lib/crm/cib/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,12 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +31,70 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = lib/crm/cib
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+libcib_la_LIBADD =
+am_libcib_la_OBJECTS = libcib_la-cib_client.lo libcib_la-cib_native.lo \
+	libcib_la-cib_attrs.lo libcib_la-cib_version.lo
+libcib_la_OBJECTS = $(am_libcib_la_OBJECTS)
+libcib_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libcib_la_CFLAGS) \
+	$(CFLAGS) $(libcib_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libcib_la_SOURCES)
+DIST_SOURCES = $(libcib_la_SOURCES)
+HEADERS = $(noinst_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +117,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +160,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +171,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +179,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -173,14 +193,11 @@
 LIBNETDEFINES = @LIBNETDEFINES@
 LIBNETLIBS = @LIBNETLIBS@
 LIBOBJS = @LIBOBJS@
-
 LIBRT = @LIBRT@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -189,15 +206,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -227,8 +241,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -249,8 +261,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -261,20 +271,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -282,17 +280,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -300,6 +300,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -321,6 +322,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -335,12 +337,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # Copyright (C) 2004 Andrew Beekhof
@@ -360,13 +365,11 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include  -I$(top_srcdir)/include  \
 		  -I$(top_builddir)/libltdl  -I$(top_srcdir)/libltdl  \
 		  -I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
 		  -I$(top_builddir)          -I$(top_srcdir)
 
-
 hadir = $(sysconfdir)/ha.d
 halibdir = $(libdir)/@HB_PKG@
 commmoddir = $(halibdir)/modules/comm
@@ -379,91 +382,78 @@
 apigid = @HA_APIGID@
 crmuid = @HA_CCMUID@
 AM_CFLAGS = @CFLAGS@ $(CRM_DEBUG_FLAGS)
-
 lib_LTLIBRARIES = libcib.la
-
 noinst_HEADERS = cib_private.h
 libcib_la_SOURCES = cib_client.c cib_native.c cib_attrs.c \
 			cib_version.c
 
-
 libcib_la_LDFLAGS = -version-info 1:1:0
 libcib_la_CFLAGS = -I$(top_builddir)
-subdir = lib/crm/cib
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(lib_LTLIBRARIES)
-
-libcib_la_LIBADD =
-am_libcib_la_OBJECTS = libcib_la-cib_client.lo libcib_la-cib_native.lo \
-	libcib_la-cib_attrs.lo libcib_la-cib_version.lo
-libcib_la_OBJECTS = $(am_libcib_la_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libcib_la-cib_attrs.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libcib_la-cib_client.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libcib_la-cib_native.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libcib_la-cib_version.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libcib_la_SOURCES)
-HEADERS = $(noinst_HEADERS)
-
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(libcib_la_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/crm/cib/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/crm/cib/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-libLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libcib.la: $(libcib_la_OBJECTS) $(libcib_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libcib_la_LDFLAGS) $(libcib_la_OBJECTS) $(libcib_la_LIBADD) $(LIBS)
+	$(libcib_la_LINK) -rpath $(libdir) $(libcib_la_OBJECTS) $(libcib_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -474,169 +464,53 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcib_la-cib_version.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-libcib_la-cib_client.o: cib_client.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -MT libcib_la-cib_client.o -MD -MP -MF "$(DEPDIR)/libcib_la-cib_client.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libcib_la-cib_client.o `test -f 'cib_client.c' || echo '$(srcdir)/'`cib_client.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcib_la-cib_client.Tpo" "$(DEPDIR)/libcib_la-cib_client.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libcib_la-cib_client.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cib_client.c' object='libcib_la-cib_client.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcib_la-cib_client.Po' tmpdepfile='$(DEPDIR)/libcib_la-cib_client.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -c -o libcib_la-cib_client.o `test -f 'cib_client.c' || echo '$(srcdir)/'`cib_client.c
-
-libcib_la-cib_client.obj: cib_client.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -MT libcib_la-cib_client.obj -MD -MP -MF "$(DEPDIR)/libcib_la-cib_client.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libcib_la-cib_client.obj `if test -f 'cib_client.c'; then $(CYGPATH_W) 'cib_client.c'; else $(CYGPATH_W) '$(srcdir)/cib_client.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcib_la-cib_client.Tpo" "$(DEPDIR)/libcib_la-cib_client.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libcib_la-cib_client.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cib_client.c' object='libcib_la-cib_client.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcib_la-cib_client.Po' tmpdepfile='$(DEPDIR)/libcib_la-cib_client.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -c -o libcib_la-cib_client.obj `if test -f 'cib_client.c'; then $(CYGPATH_W) 'cib_client.c'; else $(CYGPATH_W) '$(srcdir)/cib_client.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 libcib_la-cib_client.lo: cib_client.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -MT libcib_la-cib_client.lo -MD -MP -MF "$(DEPDIR)/libcib_la-cib_client.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libcib_la-cib_client.lo `test -f 'cib_client.c' || echo '$(srcdir)/'`cib_client.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcib_la-cib_client.Tpo" "$(DEPDIR)/libcib_la-cib_client.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libcib_la-cib_client.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -MT libcib_la-cib_client.lo -MD -MP -MF $(DEPDIR)/libcib_la-cib_client.Tpo -c -o libcib_la-cib_client.lo `test -f 'cib_client.c' || echo '$(srcdir)/'`cib_client.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcib_la-cib_client.Tpo $(DEPDIR)/libcib_la-cib_client.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cib_client.c' object='libcib_la-cib_client.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcib_la-cib_client.Plo' tmpdepfile='$(DEPDIR)/libcib_la-cib_client.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -c -o libcib_la-cib_client.lo `test -f 'cib_client.c' || echo '$(srcdir)/'`cib_client.c
-
-libcib_la-cib_native.o: cib_native.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -MT libcib_la-cib_native.o -MD -MP -MF "$(DEPDIR)/libcib_la-cib_native.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libcib_la-cib_native.o `test -f 'cib_native.c' || echo '$(srcdir)/'`cib_native.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcib_la-cib_native.Tpo" "$(DEPDIR)/libcib_la-cib_native.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libcib_la-cib_native.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cib_native.c' object='libcib_la-cib_native.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcib_la-cib_native.Po' tmpdepfile='$(DEPDIR)/libcib_la-cib_native.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -c -o libcib_la-cib_native.o `test -f 'cib_native.c' || echo '$(srcdir)/'`cib_native.c
-
-libcib_la-cib_native.obj: cib_native.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -MT libcib_la-cib_native.obj -MD -MP -MF "$(DEPDIR)/libcib_la-cib_native.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libcib_la-cib_native.obj `if test -f 'cib_native.c'; then $(CYGPATH_W) 'cib_native.c'; else $(CYGPATH_W) '$(srcdir)/cib_native.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcib_la-cib_native.Tpo" "$(DEPDIR)/libcib_la-cib_native.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libcib_la-cib_native.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cib_native.c' object='libcib_la-cib_native.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcib_la-cib_native.Po' tmpdepfile='$(DEPDIR)/libcib_la-cib_native.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -c -o libcib_la-cib_native.obj `if test -f 'cib_native.c'; then $(CYGPATH_W) 'cib_native.c'; else $(CYGPATH_W) '$(srcdir)/cib_native.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -c -o libcib_la-cib_client.lo `test -f 'cib_client.c' || echo '$(srcdir)/'`cib_client.c
 
 libcib_la-cib_native.lo: cib_native.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -MT libcib_la-cib_native.lo -MD -MP -MF "$(DEPDIR)/libcib_la-cib_native.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libcib_la-cib_native.lo `test -f 'cib_native.c' || echo '$(srcdir)/'`cib_native.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcib_la-cib_native.Tpo" "$(DEPDIR)/libcib_la-cib_native.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libcib_la-cib_native.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -MT libcib_la-cib_native.lo -MD -MP -MF $(DEPDIR)/libcib_la-cib_native.Tpo -c -o libcib_la-cib_native.lo `test -f 'cib_native.c' || echo '$(srcdir)/'`cib_native.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcib_la-cib_native.Tpo $(DEPDIR)/libcib_la-cib_native.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cib_native.c' object='libcib_la-cib_native.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcib_la-cib_native.Plo' tmpdepfile='$(DEPDIR)/libcib_la-cib_native.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -c -o libcib_la-cib_native.lo `test -f 'cib_native.c' || echo '$(srcdir)/'`cib_native.c
-
-libcib_la-cib_attrs.o: cib_attrs.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -MT libcib_la-cib_attrs.o -MD -MP -MF "$(DEPDIR)/libcib_la-cib_attrs.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libcib_la-cib_attrs.o `test -f 'cib_attrs.c' || echo '$(srcdir)/'`cib_attrs.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcib_la-cib_attrs.Tpo" "$(DEPDIR)/libcib_la-cib_attrs.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libcib_la-cib_attrs.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cib_attrs.c' object='libcib_la-cib_attrs.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcib_la-cib_attrs.Po' tmpdepfile='$(DEPDIR)/libcib_la-cib_attrs.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -c -o libcib_la-cib_attrs.o `test -f 'cib_attrs.c' || echo '$(srcdir)/'`cib_attrs.c
-
-libcib_la-cib_attrs.obj: cib_attrs.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -MT libcib_la-cib_attrs.obj -MD -MP -MF "$(DEPDIR)/libcib_la-cib_attrs.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libcib_la-cib_attrs.obj `if test -f 'cib_attrs.c'; then $(CYGPATH_W) 'cib_attrs.c'; else $(CYGPATH_W) '$(srcdir)/cib_attrs.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcib_la-cib_attrs.Tpo" "$(DEPDIR)/libcib_la-cib_attrs.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libcib_la-cib_attrs.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cib_attrs.c' object='libcib_la-cib_attrs.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcib_la-cib_attrs.Po' tmpdepfile='$(DEPDIR)/libcib_la-cib_attrs.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -c -o libcib_la-cib_attrs.obj `if test -f 'cib_attrs.c'; then $(CYGPATH_W) 'cib_attrs.c'; else $(CYGPATH_W) '$(srcdir)/cib_attrs.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -c -o libcib_la-cib_native.lo `test -f 'cib_native.c' || echo '$(srcdir)/'`cib_native.c
 
 libcib_la-cib_attrs.lo: cib_attrs.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -MT libcib_la-cib_attrs.lo -MD -MP -MF "$(DEPDIR)/libcib_la-cib_attrs.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libcib_la-cib_attrs.lo `test -f 'cib_attrs.c' || echo '$(srcdir)/'`cib_attrs.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcib_la-cib_attrs.Tpo" "$(DEPDIR)/libcib_la-cib_attrs.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libcib_la-cib_attrs.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -MT libcib_la-cib_attrs.lo -MD -MP -MF $(DEPDIR)/libcib_la-cib_attrs.Tpo -c -o libcib_la-cib_attrs.lo `test -f 'cib_attrs.c' || echo '$(srcdir)/'`cib_attrs.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcib_la-cib_attrs.Tpo $(DEPDIR)/libcib_la-cib_attrs.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cib_attrs.c' object='libcib_la-cib_attrs.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcib_la-cib_attrs.Plo' tmpdepfile='$(DEPDIR)/libcib_la-cib_attrs.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -c -o libcib_la-cib_attrs.lo `test -f 'cib_attrs.c' || echo '$(srcdir)/'`cib_attrs.c
-
-libcib_la-cib_version.o: cib_version.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -MT libcib_la-cib_version.o -MD -MP -MF "$(DEPDIR)/libcib_la-cib_version.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libcib_la-cib_version.o `test -f 'cib_version.c' || echo '$(srcdir)/'`cib_version.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcib_la-cib_version.Tpo" "$(DEPDIR)/libcib_la-cib_version.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libcib_la-cib_version.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cib_version.c' object='libcib_la-cib_version.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcib_la-cib_version.Po' tmpdepfile='$(DEPDIR)/libcib_la-cib_version.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -c -o libcib_la-cib_version.o `test -f 'cib_version.c' || echo '$(srcdir)/'`cib_version.c
-
-libcib_la-cib_version.obj: cib_version.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -MT libcib_la-cib_version.obj -MD -MP -MF "$(DEPDIR)/libcib_la-cib_version.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libcib_la-cib_version.obj `if test -f 'cib_version.c'; then $(CYGPATH_W) 'cib_version.c'; else $(CYGPATH_W) '$(srcdir)/cib_version.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcib_la-cib_version.Tpo" "$(DEPDIR)/libcib_la-cib_version.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libcib_la-cib_version.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cib_version.c' object='libcib_la-cib_version.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcib_la-cib_version.Po' tmpdepfile='$(DEPDIR)/libcib_la-cib_version.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -c -o libcib_la-cib_version.obj `if test -f 'cib_version.c'; then $(CYGPATH_W) 'cib_version.c'; else $(CYGPATH_W) '$(srcdir)/cib_version.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -c -o libcib_la-cib_attrs.lo `test -f 'cib_attrs.c' || echo '$(srcdir)/'`cib_attrs.c
 
 libcib_la-cib_version.lo: cib_version.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -MT libcib_la-cib_version.lo -MD -MP -MF "$(DEPDIR)/libcib_la-cib_version.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libcib_la-cib_version.lo `test -f 'cib_version.c' || echo '$(srcdir)/'`cib_version.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libcib_la-cib_version.Tpo" "$(DEPDIR)/libcib_la-cib_version.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libcib_la-cib_version.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -MT libcib_la-cib_version.lo -MD -MP -MF $(DEPDIR)/libcib_la-cib_version.Tpo -c -o libcib_la-cib_version.lo `test -f 'cib_version.c' || echo '$(srcdir)/'`cib_version.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcib_la-cib_version.Tpo $(DEPDIR)/libcib_la-cib_version.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cib_version.c' object='libcib_la-cib_version.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libcib_la-cib_version.Plo' tmpdepfile='$(DEPDIR)/libcib_la-cib_version.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -c -o libcib_la-cib_version.lo `test -f 'cib_version.c' || echo '$(srcdir)/'`cib_version.c
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcib_la_CFLAGS) $(CFLAGS) -c -o libcib_la-cib_version.lo `test -f 'cib_version.c' || echo '$(srcdir)/'`cib_version.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -644,18 +518,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -664,6 +526,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -675,10 +538,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -701,28 +565,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -736,9 +595,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	for dir in "$(DESTDIR)$(libdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -756,7 +616,7 @@
 mostlyclean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -771,24 +631,34 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-exec-local install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -809,20 +679,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
+uninstall-am: uninstall-libLTLIBRARIES uninstall-local
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-exec-local install-info install-info-am \
-	install-libLTLIBRARIES install-man install-strip installcheck \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-exec-local \
+	install-html install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-libLTLIBRARIES uninstall-local
+	tags uninstall uninstall-am uninstall-libLTLIBRARIES \
+	uninstall-local
 
 
 clean-generic:
--- a/lib/crm/common/Makefile.in
+++ b/lib/crm/common/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,13 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +32,73 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+halib_PROGRAMS =
+subdir = lib/crm/common
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(halibdir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+libcrmcommon_la_LIBADD =
+am_libcrmcommon_la_OBJECTS = ipc.lo msg.lo utils.lo xml.lo ctrl.lo \
+	iso8601.lo iso8601_fields.lo
+libcrmcommon_la_OBJECTS = $(am_libcrmcommon_la_OBJECTS)
+libcrmcommon_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libcrmcommon_la_LDFLAGS) $(LDFLAGS) -o $@
+halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(halib_PROGRAMS)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libcrmcommon_la_SOURCES)
+DIST_SOURCES = $(libcrmcommon_la_SOURCES)
+HEADERS = $(noinst_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +121,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +164,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +175,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +183,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +202,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +210,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +245,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +265,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +275,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +284,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +304,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +326,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +341,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # Copyright (C) 2004 Andrew Beekhof
@@ -359,115 +369,93 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include  -I$(top_srcdir)/include   \
 		  -I$(top_builddir)/libltdl  -I$(top_srcdir)/libltdl   \
 		  -I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha  \
 		  -I$(top_builddir)          -I$(top_srcdir)
 
-
 AM_CFLAGS = @CFLAGS@ $(CRM_DEBUG_FLAGS)
-
 hadir = $(sysconfdir)/ha.d
 halibdir = $(libdir)/@HB_PKG@
-
 lib_LTLIBRARIES = libcrmcommon.la
-
-halib_PROGRAMS = 
-
 noinst_HEADERS = 
-
 libcrmcommon_la_SOURCES = ipc.c msg.c utils.c xml.c ctrl.c \
 			iso8601.c iso8601_fields.c
 
 libcrmcommon_la_LDFLAGS = -version-info 1:1:0
-subdir = lib/crm/common
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(lib_LTLIBRARIES)
-
-libcrmcommon_la_LIBADD =
-am_libcrmcommon_la_OBJECTS = ipc.lo msg.lo utils.lo xml.lo ctrl.lo \
-	iso8601.lo iso8601_fields.lo
-libcrmcommon_la_OBJECTS = $(am_libcrmcommon_la_OBJECTS)
-halib_PROGRAMS =
-PROGRAMS = $(halib_PROGRAMS)
-
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ctrl.Plo ./$(DEPDIR)/ipc.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/iso8601.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/iso8601_fields.Plo ./$(DEPDIR)/msg.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/utils.Plo ./$(DEPDIR)/xml.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libcrmcommon_la_SOURCES)
-HEADERS = $(noinst_HEADERS)
-
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(libcrmcommon_la_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/crm/common/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/crm/common/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-libLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libcrmcommon.la: $(libcrmcommon_la_OBJECTS) $(libcrmcommon_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libcrmcommon_la_LDFLAGS) $(libcrmcommon_la_OBJECTS) $(libcrmcommon_la_LIBADD) $(LIBS)
-halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+	$(libcrmcommon_la_LINK) -rpath $(libdir) $(libcrmcommon_la_OBJECTS) $(libcrmcommon_la_LIBADD) $(LIBS)
 install-halibPROGRAMS: $(halib_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	test -z "$(halibdir)" || $(MKDIR_P) "$(DESTDIR)$(halibdir)"
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -475,8 +463,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(halibdir)/$$f"; \
-	  rm -f $(DESTDIR)$(halibdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(halibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(halibdir)/$$f"; \
 	done
 
 clean-halibPROGRAMS:
@@ -487,7 +475,7 @@
 	done
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -501,37 +489,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -539,18 +515,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -559,6 +523,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -570,10 +535,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -596,28 +562,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -631,9 +592,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(halibdir)
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(halibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -651,7 +613,7 @@
 mostlyclean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -666,24 +628,34 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-halibPROGRAMS
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-exec-local install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -704,21 +676,25 @@
 
 ps-am:
 
-uninstall-am: uninstall-halibPROGRAMS uninstall-info-am \
-	uninstall-libLTLIBRARIES uninstall-local
+uninstall-am: uninstall-halibPROGRAMS uninstall-libLTLIBRARIES \
+	uninstall-local
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-halibPROGRAMS clean-libLTLIBRARIES clean-libtool ctags \
-	distclean distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
 	install-exec-am install-exec-local install-halibPROGRAMS \
-	install-info install-info-am install-libLTLIBRARIES install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
-	pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-halibPROGRAMS uninstall-info-am \
+	install-html install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-halibPROGRAMS \
 	uninstall-libLTLIBRARIES uninstall-local
 
 
--- a/lib/crm/pengine/Makefile.in
+++ b/lib/crm/pengine/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,12 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +31,78 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = lib/crm/pengine
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+libpe_rules_la_LIBADD =
+am__objects_1 = rules.lo common.lo
+am_libpe_rules_la_OBJECTS = $(am__objects_1)
+libpe_rules_la_OBJECTS = $(am_libpe_rules_la_OBJECTS)
+libpe_rules_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libpe_rules_la_LDFLAGS) $(LDFLAGS) -o $@
+libpe_status_la_LIBADD =
+am__objects_2 = status.lo unpack.lo utils.lo complex.lo native.lo \
+	group.lo clone.lo
+am_libpe_status_la_OBJECTS = $(am__objects_1) $(am__objects_2)
+libpe_status_la_OBJECTS = $(am_libpe_status_la_OBJECTS)
+libpe_status_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libpe_status_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libpe_rules_la_SOURCES) $(libpe_status_la_SOURCES)
+DIST_SOURCES = $(libpe_rules_la_SOURCES) $(libpe_status_la_SOURCES)
+HEADERS = $(noinst_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +125,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +168,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +179,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +187,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -173,14 +201,11 @@
 LIBNETDEFINES = @LIBNETDEFINES@
 LIBNETLIBS = @LIBNETLIBS@
 LIBOBJS = @LIBOBJS@
-
 LIBRT = @LIBRT@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -189,15 +214,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -227,8 +249,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -249,8 +269,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -261,20 +279,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -282,17 +288,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -300,6 +308,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -321,6 +330,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -335,12 +345,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # Copyright (C) 2004 Andrew Beekhof
@@ -360,13 +373,11 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include	\
 		-I$(top_builddir)/libltdl   -I$(top_srcdir)/libltdl	\
 		-I$(top_builddir)/linux-ha  -I$(top_srcdir)/linux-ha \
 		-I$(top_builddir)           -I$(top_srcdir)
 
-
 hadir = $(sysconfdir)/ha.d
 halibdir = $(libdir)/@HB_PKG@
 commmoddir = $(halibdir)/modules/comm
@@ -378,102 +389,81 @@
 apigid = @HA_APIGID@
 crmuid = @HA_CCMUID@
 AM_CFLAGS = @CFLAGS@ $(CRM_DEBUG_FLAGS)
-
 lib_LTLIBRARIES = libpe_rules.la libpe_status.la
-
 noinst_HEADERS = unpack.h utils.h variant.h
-
 rule_files = rules.c common.c
 status_files = status.c unpack.c utils.c complex.c native.c group.c clone.c
-
 libpe_rules_la_LDFLAGS = -version-info 2:0:0
 libpe_rules_la_SOURCES = $(rule_files)
-
 libpe_status_la_LDFLAGS = -version-info 2:0:0
 libpe_status_la_SOURCES = $(rule_files) $(status_files)
-subdir = lib/crm/pengine
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(lib_LTLIBRARIES)
-
-libpe_rules_la_LIBADD =
-am__objects_1 = rules.lo common.lo
-am_libpe_rules_la_OBJECTS = $(am__objects_1)
-libpe_rules_la_OBJECTS = $(am_libpe_rules_la_OBJECTS)
-libpe_status_la_LIBADD =
-am__objects_2 = status.lo unpack.lo utils.lo complex.lo native.lo \
-	group.lo clone.lo
-am_libpe_status_la_OBJECTS = $(am__objects_1) $(am__objects_2)
-libpe_status_la_OBJECTS = $(am_libpe_status_la_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/clone.Plo ./$(DEPDIR)/common.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/complex.Plo ./$(DEPDIR)/group.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/native.Plo ./$(DEPDIR)/rules.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/status.Plo ./$(DEPDIR)/unpack.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/utils.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libpe_rules_la_SOURCES) $(libpe_status_la_SOURCES)
-HEADERS = $(noinst_HEADERS)
-
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(libpe_rules_la_SOURCES) $(libpe_status_la_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/crm/pengine/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/crm/pengine/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-libLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libpe_rules.la: $(libpe_rules_la_OBJECTS) $(libpe_rules_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libpe_rules_la_LDFLAGS) $(libpe_rules_la_OBJECTS) $(libpe_rules_la_LIBADD) $(LIBS)
+	$(libpe_rules_la_LINK) -rpath $(libdir) $(libpe_rules_la_OBJECTS) $(libpe_rules_la_LIBADD) $(LIBS)
 libpe_status.la: $(libpe_status_la_OBJECTS) $(libpe_status_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libpe_status_la_LDFLAGS) $(libpe_status_la_OBJECTS) $(libpe_status_la_LIBADD) $(LIBS)
+	$(libpe_status_la_LINK) -rpath $(libdir) $(libpe_status_la_OBJECTS) $(libpe_status_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -489,37 +479,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -527,18 +505,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -547,6 +513,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -558,10 +525,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -584,28 +552,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -619,9 +582,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	for dir in "$(DESTDIR)$(libdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -639,7 +603,7 @@
 mostlyclean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -654,24 +618,34 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-exec-local install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -692,20 +666,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
+uninstall-am: uninstall-libLTLIBRARIES uninstall-local
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-exec-local install-info install-info-am \
-	install-libLTLIBRARIES install-man install-strip installcheck \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-exec-local \
+	install-html install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-libLTLIBRARIES uninstall-local
+	tags uninstall uninstall-am uninstall-libLTLIBRARIES \
+	uninstall-local
 
 
 clean-generic:
--- a/lib/crm/transition/Makefile.in
+++ b/lib/crm/transition/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,12 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +31,71 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = lib/crm/transition
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+libtransitioner_la_LIBADD =
+am_libtransitioner_la_OBJECTS = libtransitioner_la-unpack.lo \
+	libtransitioner_la-graph.lo libtransitioner_la-utils.lo
+libtransitioner_la_OBJECTS = $(am_libtransitioner_la_OBJECTS)
+libtransitioner_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(libtransitioner_la_CFLAGS) $(CFLAGS) \
+	$(libtransitioner_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libtransitioner_la_SOURCES)
+DIST_SOURCES = $(libtransitioner_la_SOURCES)
+HEADERS = $(noinst_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +118,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +161,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +172,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +180,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -173,14 +194,11 @@
 LIBNETDEFINES = @LIBNETDEFINES@
 LIBNETLIBS = @LIBNETLIBS@
 LIBOBJS = @LIBOBJS@
-
 LIBRT = @LIBRT@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -189,15 +207,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -227,8 +242,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -249,8 +262,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -261,20 +272,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -282,17 +281,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -300,6 +301,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -321,6 +323,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -335,12 +338,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # Copyright (C) 2004 Andrew Beekhof
@@ -360,97 +366,83 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include  -I$(top_srcdir)/include  \
 		  -I$(top_builddir)/libltdl  -I$(top_srcdir)/libltdl  \
 		  -I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
 		  -I$(top_builddir)          -I$(top_srcdir)
 
-
 halibdir = $(libdir)/@HB_PKG@
 AM_CFLAGS = @CFLAGS@ $(CRM_DEBUG_FLAGS)
-
 lib_LTLIBRARIES = libtransitioner.la
-
 noinst_HEADERS = 
 libtransitioner_la_SOURCES = unpack.c graph.c utils.c
-
 libtransitioner_la_LDFLAGS = -version-info 1:0:0
 libtransitioner_la_CFLAGS = -I$(top_builddir)
-subdir = lib/crm/transition
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(lib_LTLIBRARIES)
-
-libtransitioner_la_LIBADD =
-am_libtransitioner_la_OBJECTS = libtransitioner_la-unpack.lo \
-	libtransitioner_la-graph.lo libtransitioner_la-utils.lo
-libtransitioner_la_OBJECTS = $(am_libtransitioner_la_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libtransitioner_la-graph.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libtransitioner_la-unpack.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libtransitioner_la-utils.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libtransitioner_la_SOURCES)
-HEADERS = $(noinst_HEADERS)
-
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(libtransitioner_la_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/crm/transition/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/crm/transition/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-libLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libtransitioner.la: $(libtransitioner_la_OBJECTS) $(libtransitioner_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libtransitioner_la_LDFLAGS) $(libtransitioner_la_OBJECTS) $(libtransitioner_la_LIBADD) $(LIBS)
+	$(libtransitioner_la_LINK) -rpath $(libdir) $(libtransitioner_la_OBJECTS) $(libtransitioner_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -460,136 +452,46 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtransitioner_la-utils.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-libtransitioner_la-unpack.o: unpack.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtransitioner_la_CFLAGS) $(CFLAGS) -MT libtransitioner_la-unpack.o -MD -MP -MF "$(DEPDIR)/libtransitioner_la-unpack.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libtransitioner_la-unpack.o `test -f 'unpack.c' || echo '$(srcdir)/'`unpack.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libtransitioner_la-unpack.Tpo" "$(DEPDIR)/libtransitioner_la-unpack.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libtransitioner_la-unpack.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='unpack.c' object='libtransitioner_la-unpack.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libtransitioner_la-unpack.Po' tmpdepfile='$(DEPDIR)/libtransitioner_la-unpack.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtransitioner_la_CFLAGS) $(CFLAGS) -c -o libtransitioner_la-unpack.o `test -f 'unpack.c' || echo '$(srcdir)/'`unpack.c
-
-libtransitioner_la-unpack.obj: unpack.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtransitioner_la_CFLAGS) $(CFLAGS) -MT libtransitioner_la-unpack.obj -MD -MP -MF "$(DEPDIR)/libtransitioner_la-unpack.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libtransitioner_la-unpack.obj `if test -f 'unpack.c'; then $(CYGPATH_W) 'unpack.c'; else $(CYGPATH_W) '$(srcdir)/unpack.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libtransitioner_la-unpack.Tpo" "$(DEPDIR)/libtransitioner_la-unpack.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libtransitioner_la-unpack.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='unpack.c' object='libtransitioner_la-unpack.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libtransitioner_la-unpack.Po' tmpdepfile='$(DEPDIR)/libtransitioner_la-unpack.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtransitioner_la_CFLAGS) $(CFLAGS) -c -o libtransitioner_la-unpack.obj `if test -f 'unpack.c'; then $(CYGPATH_W) 'unpack.c'; else $(CYGPATH_W) '$(srcdir)/unpack.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 libtransitioner_la-unpack.lo: unpack.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtransitioner_la_CFLAGS) $(CFLAGS) -MT libtransitioner_la-unpack.lo -MD -MP -MF "$(DEPDIR)/libtransitioner_la-unpack.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libtransitioner_la-unpack.lo `test -f 'unpack.c' || echo '$(srcdir)/'`unpack.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libtransitioner_la-unpack.Tpo" "$(DEPDIR)/libtransitioner_la-unpack.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libtransitioner_la-unpack.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtransitioner_la_CFLAGS) $(CFLAGS) -MT libtransitioner_la-unpack.lo -MD -MP -MF $(DEPDIR)/libtransitioner_la-unpack.Tpo -c -o libtransitioner_la-unpack.lo `test -f 'unpack.c' || echo '$(srcdir)/'`unpack.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libtransitioner_la-unpack.Tpo $(DEPDIR)/libtransitioner_la-unpack.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='unpack.c' object='libtransitioner_la-unpack.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libtransitioner_la-unpack.Plo' tmpdepfile='$(DEPDIR)/libtransitioner_la-unpack.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtransitioner_la_CFLAGS) $(CFLAGS) -c -o libtransitioner_la-unpack.lo `test -f 'unpack.c' || echo '$(srcdir)/'`unpack.c
-
-libtransitioner_la-graph.o: graph.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtransitioner_la_CFLAGS) $(CFLAGS) -MT libtransitioner_la-graph.o -MD -MP -MF "$(DEPDIR)/libtransitioner_la-graph.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libtransitioner_la-graph.o `test -f 'graph.c' || echo '$(srcdir)/'`graph.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libtransitioner_la-graph.Tpo" "$(DEPDIR)/libtransitioner_la-graph.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libtransitioner_la-graph.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='graph.c' object='libtransitioner_la-graph.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libtransitioner_la-graph.Po' tmpdepfile='$(DEPDIR)/libtransitioner_la-graph.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtransitioner_la_CFLAGS) $(CFLAGS) -c -o libtransitioner_la-graph.o `test -f 'graph.c' || echo '$(srcdir)/'`graph.c
-
-libtransitioner_la-graph.obj: graph.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtransitioner_la_CFLAGS) $(CFLAGS) -MT libtransitioner_la-graph.obj -MD -MP -MF "$(DEPDIR)/libtransitioner_la-graph.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libtransitioner_la-graph.obj `if test -f 'graph.c'; then $(CYGPATH_W) 'graph.c'; else $(CYGPATH_W) '$(srcdir)/graph.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libtransitioner_la-graph.Tpo" "$(DEPDIR)/libtransitioner_la-graph.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libtransitioner_la-graph.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='graph.c' object='libtransitioner_la-graph.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libtransitioner_la-graph.Po' tmpdepfile='$(DEPDIR)/libtransitioner_la-graph.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtransitioner_la_CFLAGS) $(CFLAGS) -c -o libtransitioner_la-graph.obj `if test -f 'graph.c'; then $(CYGPATH_W) 'graph.c'; else $(CYGPATH_W) '$(srcdir)/graph.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtransitioner_la_CFLAGS) $(CFLAGS) -c -o libtransitioner_la-unpack.lo `test -f 'unpack.c' || echo '$(srcdir)/'`unpack.c
 
 libtransitioner_la-graph.lo: graph.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtransitioner_la_CFLAGS) $(CFLAGS) -MT libtransitioner_la-graph.lo -MD -MP -MF "$(DEPDIR)/libtransitioner_la-graph.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libtransitioner_la-graph.lo `test -f 'graph.c' || echo '$(srcdir)/'`graph.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libtransitioner_la-graph.Tpo" "$(DEPDIR)/libtransitioner_la-graph.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libtransitioner_la-graph.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtransitioner_la_CFLAGS) $(CFLAGS) -MT libtransitioner_la-graph.lo -MD -MP -MF $(DEPDIR)/libtransitioner_la-graph.Tpo -c -o libtransitioner_la-graph.lo `test -f 'graph.c' || echo '$(srcdir)/'`graph.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libtransitioner_la-graph.Tpo $(DEPDIR)/libtransitioner_la-graph.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='graph.c' object='libtransitioner_la-graph.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libtransitioner_la-graph.Plo' tmpdepfile='$(DEPDIR)/libtransitioner_la-graph.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtransitioner_la_CFLAGS) $(CFLAGS) -c -o libtransitioner_la-graph.lo `test -f 'graph.c' || echo '$(srcdir)/'`graph.c
-
-libtransitioner_la-utils.o: utils.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtransitioner_la_CFLAGS) $(CFLAGS) -MT libtransitioner_la-utils.o -MD -MP -MF "$(DEPDIR)/libtransitioner_la-utils.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libtransitioner_la-utils.o `test -f 'utils.c' || echo '$(srcdir)/'`utils.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libtransitioner_la-utils.Tpo" "$(DEPDIR)/libtransitioner_la-utils.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libtransitioner_la-utils.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='utils.c' object='libtransitioner_la-utils.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libtransitioner_la-utils.Po' tmpdepfile='$(DEPDIR)/libtransitioner_la-utils.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtransitioner_la_CFLAGS) $(CFLAGS) -c -o libtransitioner_la-utils.o `test -f 'utils.c' || echo '$(srcdir)/'`utils.c
-
-libtransitioner_la-utils.obj: utils.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtransitioner_la_CFLAGS) $(CFLAGS) -MT libtransitioner_la-utils.obj -MD -MP -MF "$(DEPDIR)/libtransitioner_la-utils.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libtransitioner_la-utils.obj `if test -f 'utils.c'; then $(CYGPATH_W) 'utils.c'; else $(CYGPATH_W) '$(srcdir)/utils.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libtransitioner_la-utils.Tpo" "$(DEPDIR)/libtransitioner_la-utils.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libtransitioner_la-utils.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='utils.c' object='libtransitioner_la-utils.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libtransitioner_la-utils.Po' tmpdepfile='$(DEPDIR)/libtransitioner_la-utils.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtransitioner_la_CFLAGS) $(CFLAGS) -c -o libtransitioner_la-utils.obj `if test -f 'utils.c'; then $(CYGPATH_W) 'utils.c'; else $(CYGPATH_W) '$(srcdir)/utils.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtransitioner_la_CFLAGS) $(CFLAGS) -c -o libtransitioner_la-graph.lo `test -f 'graph.c' || echo '$(srcdir)/'`graph.c
 
 libtransitioner_la-utils.lo: utils.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtransitioner_la_CFLAGS) $(CFLAGS) -MT libtransitioner_la-utils.lo -MD -MP -MF "$(DEPDIR)/libtransitioner_la-utils.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libtransitioner_la-utils.lo `test -f 'utils.c' || echo '$(srcdir)/'`utils.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libtransitioner_la-utils.Tpo" "$(DEPDIR)/libtransitioner_la-utils.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libtransitioner_la-utils.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtransitioner_la_CFLAGS) $(CFLAGS) -MT libtransitioner_la-utils.lo -MD -MP -MF $(DEPDIR)/libtransitioner_la-utils.Tpo -c -o libtransitioner_la-utils.lo `test -f 'utils.c' || echo '$(srcdir)/'`utils.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libtransitioner_la-utils.Tpo $(DEPDIR)/libtransitioner_la-utils.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='utils.c' object='libtransitioner_la-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libtransitioner_la-utils.Plo' tmpdepfile='$(DEPDIR)/libtransitioner_la-utils.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtransitioner_la_CFLAGS) $(CFLAGS) -c -o libtransitioner_la-utils.lo `test -f 'utils.c' || echo '$(srcdir)/'`utils.c
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtransitioner_la_CFLAGS) $(CFLAGS) -c -o libtransitioner_la-utils.lo `test -f 'utils.c' || echo '$(srcdir)/'`utils.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -597,18 +499,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -617,6 +507,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -628,10 +519,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -654,28 +546,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -689,9 +576,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	for dir in "$(DESTDIR)$(libdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -709,7 +597,7 @@
 mostlyclean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -724,24 +612,34 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-exec-local install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -762,20 +660,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
+uninstall-am: uninstall-libLTLIBRARIES uninstall-local
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-exec-local install-info install-info-am \
-	install-libLTLIBRARIES install-man install-strip installcheck \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-exec-local \
+	install-html install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-libLTLIBRARIES uninstall-local
+	tags uninstall uninstall-am uninstall-libLTLIBRARIES \
+	uninstall-local
 
 
 clean-generic:
--- a/lib/fencing/Makefile.in
+++ b/lib/fencing/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,67 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = lib/fencing
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+libstonithd_la_LIBADD =
+am_libstonithd_la_OBJECTS = stonithd_lib.lo stonithd_msg.lo
+libstonithd_la_OBJECTS = $(am_libstonithd_la_OBJECTS)
+libstonithd_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libstonithd_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libstonithd_la_SOURCES)
+DIST_SOURCES = $(libstonithd_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +113,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +156,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +167,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +175,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +194,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +202,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +237,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +257,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +267,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +276,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +296,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +318,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +333,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #  File: Makefile.am
 #  Author: Sun Jiang Dong <sunjd@cn.ibm.com>
@@ -360,96 +362,86 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include  -I$(top_srcdir)/include     \
                    -I$(top_builddir)/libltdl  -I$(top_srcdir)/libltdl     \
 		   -I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha    \
 		   -I$(top_builddir)          -I$(top_srcdir)
 
-
 halibdir = $(libdir)/@HB_PKG@
 havarlibdir = $(localstatedir)/lib/@HB_PKG@
-
 COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la   \
 		    $(top_builddir)/lib/hbclient/libhbclient.la  \
 		    $(GLIBLIB)
 
-
 lib_LTLIBRARIES = libstonithd.la
 libstonithd_la_SOURCES = stonithd_lib.c stonithd_msg.c
 libstonithd_la_LDFLAGS = $(COMMONLIBS)
-
 AM_CFLAGS = $(INCLUDES)
-subdir = lib/fencing
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(lib_LTLIBRARIES)
-
-libstonithd_la_LIBADD =
-am_libstonithd_la_OBJECTS = stonithd_lib.lo stonithd_msg.lo
-libstonithd_la_OBJECTS = $(am_libstonithd_la_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/stonithd_lib.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/stonithd_msg.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libstonithd_la_SOURCES)
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(libstonithd_la_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/fencing/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/fencing/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-libLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libstonithd.la: $(libstonithd_la_OBJECTS) $(libstonithd_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libstonithd_la_LDFLAGS) $(libstonithd_la_OBJECTS) $(libstonithd_la_LIBADD) $(LIBS)
+	$(libstonithd_la_LINK) -rpath $(libdir) $(libstonithd_la_OBJECTS) $(libstonithd_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -458,37 +450,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stonithd_msg.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -496,18 +476,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -516,6 +484,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -527,10 +496,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -553,28 +523,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -588,9 +553,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	for dir in "$(DESTDIR)$(libdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -610,7 +576,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -625,24 +591,34 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -663,20 +639,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+uninstall-am: uninstall-libLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-strip installcheck \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-libLTLIBRARIES
+	tags uninstall uninstall-am uninstall-libLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/lib/hbclient/Makefile.in
+++ b/lib/hbclient/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,12 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +31,76 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+halib_PROGRAMS = api_test$(EXEEXT)
+subdir = lib/hbclient
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(halibdir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+libhbclient_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
+am_libhbclient_la_OBJECTS = client_lib.lo
+libhbclient_la_OBJECTS = $(am_libhbclient_la_OBJECTS)
+libhbclient_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libhbclient_la_LDFLAGS) $(LDFLAGS) -o $@
+halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(halib_PROGRAMS)
+am_api_test_OBJECTS = api_test.$(OBJEXT)
+api_test_OBJECTS = $(am_api_test_OBJECTS)
+am__DEPENDENCIES_1 =
+api_test_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
+	libhbclient.la $(am__DEPENDENCIES_1) \
+	$(top_builddir)/lib/pils/libpils.la
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libhbclient_la_SOURCES) $(api_test_SOURCES)
+DIST_SOURCES = $(libhbclient_la_SOURCES) $(api_test_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +123,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +166,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +177,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +185,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -173,14 +199,11 @@
 LIBNETDEFINES = @LIBNETDEFINES@
 LIBNETLIBS = @LIBNETLIBS@
 LIBOBJS = @LIBOBJS@
-
 LIBRT = @LIBRT@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -189,15 +212,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -227,8 +247,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -249,8 +267,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -261,20 +277,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -282,17 +286,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -300,6 +306,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -321,6 +328,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -335,12 +343,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # hbclient library: Linux-HA heartbeat code
@@ -363,12 +374,10 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
 			-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
 			-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
 
-
 hadir = $(sysconfdir)/ha.d
 halibdir = $(libdir)/@HB_PKG@
 commmoddir = $(halibdir)/modules/comm
@@ -381,107 +390,88 @@
 apigid = @HA_APIGID@
 gliblib = @GLIBLIB@
 AM_CFLAGS = @CFLAGS@
-
 lib_LTLIBRARIES = libhbclient.la 
-
 libhbclient_la_SOURCES = client_lib.c
 libhbclient_la_LDFLAGS = -version-info 1:0:0
 libhbclient_la_LIBADD = $(top_builddir)/replace/libreplace.la  
-
-halib_PROGRAMS = api_test
-
 api_test_SOURCES = api_test.c
 api_test_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la	\
 			libhbclient.la $(gliblib) \
 			$(top_builddir)/lib/pils/libpils.la
 
-subdir = lib/hbclient
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(lib_LTLIBRARIES)
-
-libhbclient_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
-am_libhbclient_la_OBJECTS = client_lib.lo
-libhbclient_la_OBJECTS = $(am_libhbclient_la_OBJECTS)
-halib_PROGRAMS = api_test$(EXEEXT)
-PROGRAMS = $(halib_PROGRAMS)
-
-am_api_test_OBJECTS = api_test.$(OBJEXT)
-api_test_OBJECTS = $(am_api_test_OBJECTS)
-api_test_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	libhbclient.la $(top_builddir)/lib/pils/libpils.la
-api_test_LDFLAGS =
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/api_test.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/client_lib.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libhbclient_la_SOURCES) $(api_test_SOURCES)
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(libhbclient_la_SOURCES) $(api_test_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/hbclient/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/hbclient/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-libLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libhbclient.la: $(libhbclient_la_OBJECTS) $(libhbclient_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libhbclient_la_LDFLAGS) $(libhbclient_la_OBJECTS) $(libhbclient_la_LIBADD) $(LIBS)
-halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+	$(libhbclient_la_LINK) -rpath $(libdir) $(libhbclient_la_OBJECTS) $(libhbclient_la_LIBADD) $(LIBS)
 install-halibPROGRAMS: $(halib_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	test -z "$(halibdir)" || $(MKDIR_P) "$(DESTDIR)$(halibdir)"
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -489,8 +479,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(halibdir)/$$f"; \
-	  rm -f $(DESTDIR)$(halibdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(halibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(halibdir)/$$f"; \
 	done
 
 clean-halibPROGRAMS:
@@ -501,10 +491,10 @@
 	done
 api_test$(EXEEXT): $(api_test_OBJECTS) $(api_test_DEPENDENCIES) 
 	@rm -f api_test$(EXEEXT)
-	$(LINK) $(api_test_LDFLAGS) $(api_test_OBJECTS) $(api_test_LDADD) $(LIBS)
+	$(LINK) $(api_test_OBJECTS) $(api_test_LDADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -513,37 +503,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/client_lib.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -551,18 +529,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -571,6 +537,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -582,10 +549,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -608,28 +576,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -643,9 +606,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(halibdir)
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(halibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -665,7 +629,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -680,24 +644,34 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-halibPROGRAMS
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -718,21 +692,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-halibPROGRAMS uninstall-info-am \
-	uninstall-libLTLIBRARIES
+uninstall-am: uninstall-halibPROGRAMS uninstall-libLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-halibPROGRAMS clean-libLTLIBRARIES clean-libtool ctags \
-	distclean distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-halibPROGRAMS install-info \
-	install-info-am install-libLTLIBRARIES install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
-	pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-halibPROGRAMS uninstall-info-am \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-halibPROGRAMS install-html \
+	install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-halibPROGRAMS \
 	uninstall-libLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/lib/lrm/Makefile.in
+++ b/lib/lrm/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,67 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = lib/lrm
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+liblrm_la_LIBADD =
+am_liblrm_la_OBJECTS = liblrm_la-lrm_msg.lo liblrm_la-clientlib.lo
+liblrm_la_OBJECTS = $(am_liblrm_la_OBJECTS)
+liblrm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(liblrm_la_CFLAGS) \
+	$(CFLAGS) $(liblrm_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(liblrm_la_SOURCES)
+DIST_SOURCES = $(liblrm_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +113,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +156,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +167,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +175,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +194,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +202,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +237,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +257,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +267,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +276,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +296,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +318,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +333,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # Author: Sun Jiang Dong <sunjd@cn.ibm.com>
@@ -360,12 +362,10 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
                        			-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
 					-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
 
-
 halibdir = $(libdir)/@HB_PKG@
 havarlibdir = $(localstatedir)/lib/@HB_PKG@
 COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la   \
@@ -374,81 +374,75 @@
 LRM_DIR = lrm
 lrmdir = $(HA_VARLIBDIR)/$(HB_PKG)/$(LRM_DIR)
 apigid = @HA_APIGID@
-
 lib_LTLIBRARIES = liblrm.la
 liblrm_la_SOURCES = lrm_msg.c clientlib.c
 liblrm_la_LDFLAGS = $(COMMONLIBS)
 liblrm_la_CFLAGS = $(INCLUDES)
-subdir = lib/lrm
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(lib_LTLIBRARIES)
-
-liblrm_la_LIBADD =
-am_liblrm_la_OBJECTS = liblrm_la-lrm_msg.lo liblrm_la-clientlib.lo
-liblrm_la_OBJECTS = $(am_liblrm_la_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/liblrm_la-clientlib.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/liblrm_la-lrm_msg.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(liblrm_la_SOURCES)
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(liblrm_la_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/lrm/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/lrm/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-libLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 liblrm.la: $(liblrm_la_OBJECTS) $(liblrm_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(liblrm_la_LDFLAGS) $(liblrm_la_OBJECTS) $(liblrm_la_LIBADD) $(LIBS)
+	$(liblrm_la_LINK) -rpath $(libdir) $(liblrm_la_OBJECTS) $(liblrm_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -457,103 +451,39 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblrm_la-lrm_msg.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-liblrm_la-lrm_msg.o: lrm_msg.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblrm_la_CFLAGS) $(CFLAGS) -MT liblrm_la-lrm_msg.o -MD -MP -MF "$(DEPDIR)/liblrm_la-lrm_msg.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o liblrm_la-lrm_msg.o `test -f 'lrm_msg.c' || echo '$(srcdir)/'`lrm_msg.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/liblrm_la-lrm_msg.Tpo" "$(DEPDIR)/liblrm_la-lrm_msg.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/liblrm_la-lrm_msg.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lrm_msg.c' object='liblrm_la-lrm_msg.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/liblrm_la-lrm_msg.Po' tmpdepfile='$(DEPDIR)/liblrm_la-lrm_msg.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblrm_la_CFLAGS) $(CFLAGS) -c -o liblrm_la-lrm_msg.o `test -f 'lrm_msg.c' || echo '$(srcdir)/'`lrm_msg.c
-
-liblrm_la-lrm_msg.obj: lrm_msg.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblrm_la_CFLAGS) $(CFLAGS) -MT liblrm_la-lrm_msg.obj -MD -MP -MF "$(DEPDIR)/liblrm_la-lrm_msg.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o liblrm_la-lrm_msg.obj `if test -f 'lrm_msg.c'; then $(CYGPATH_W) 'lrm_msg.c'; else $(CYGPATH_W) '$(srcdir)/lrm_msg.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/liblrm_la-lrm_msg.Tpo" "$(DEPDIR)/liblrm_la-lrm_msg.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/liblrm_la-lrm_msg.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lrm_msg.c' object='liblrm_la-lrm_msg.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/liblrm_la-lrm_msg.Po' tmpdepfile='$(DEPDIR)/liblrm_la-lrm_msg.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblrm_la_CFLAGS) $(CFLAGS) -c -o liblrm_la-lrm_msg.obj `if test -f 'lrm_msg.c'; then $(CYGPATH_W) 'lrm_msg.c'; else $(CYGPATH_W) '$(srcdir)/lrm_msg.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 liblrm_la-lrm_msg.lo: lrm_msg.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblrm_la_CFLAGS) $(CFLAGS) -MT liblrm_la-lrm_msg.lo -MD -MP -MF "$(DEPDIR)/liblrm_la-lrm_msg.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o liblrm_la-lrm_msg.lo `test -f 'lrm_msg.c' || echo '$(srcdir)/'`lrm_msg.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/liblrm_la-lrm_msg.Tpo" "$(DEPDIR)/liblrm_la-lrm_msg.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/liblrm_la-lrm_msg.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblrm_la_CFLAGS) $(CFLAGS) -MT liblrm_la-lrm_msg.lo -MD -MP -MF $(DEPDIR)/liblrm_la-lrm_msg.Tpo -c -o liblrm_la-lrm_msg.lo `test -f 'lrm_msg.c' || echo '$(srcdir)/'`lrm_msg.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/liblrm_la-lrm_msg.Tpo $(DEPDIR)/liblrm_la-lrm_msg.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lrm_msg.c' object='liblrm_la-lrm_msg.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/liblrm_la-lrm_msg.Plo' tmpdepfile='$(DEPDIR)/liblrm_la-lrm_msg.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblrm_la_CFLAGS) $(CFLAGS) -c -o liblrm_la-lrm_msg.lo `test -f 'lrm_msg.c' || echo '$(srcdir)/'`lrm_msg.c
-
-liblrm_la-clientlib.o: clientlib.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblrm_la_CFLAGS) $(CFLAGS) -MT liblrm_la-clientlib.o -MD -MP -MF "$(DEPDIR)/liblrm_la-clientlib.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o liblrm_la-clientlib.o `test -f 'clientlib.c' || echo '$(srcdir)/'`clientlib.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/liblrm_la-clientlib.Tpo" "$(DEPDIR)/liblrm_la-clientlib.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/liblrm_la-clientlib.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='clientlib.c' object='liblrm_la-clientlib.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/liblrm_la-clientlib.Po' tmpdepfile='$(DEPDIR)/liblrm_la-clientlib.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblrm_la_CFLAGS) $(CFLAGS) -c -o liblrm_la-clientlib.o `test -f 'clientlib.c' || echo '$(srcdir)/'`clientlib.c
-
-liblrm_la-clientlib.obj: clientlib.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblrm_la_CFLAGS) $(CFLAGS) -MT liblrm_la-clientlib.obj -MD -MP -MF "$(DEPDIR)/liblrm_la-clientlib.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o liblrm_la-clientlib.obj `if test -f 'clientlib.c'; then $(CYGPATH_W) 'clientlib.c'; else $(CYGPATH_W) '$(srcdir)/clientlib.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/liblrm_la-clientlib.Tpo" "$(DEPDIR)/liblrm_la-clientlib.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/liblrm_la-clientlib.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='clientlib.c' object='liblrm_la-clientlib.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/liblrm_la-clientlib.Po' tmpdepfile='$(DEPDIR)/liblrm_la-clientlib.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblrm_la_CFLAGS) $(CFLAGS) -c -o liblrm_la-clientlib.obj `if test -f 'clientlib.c'; then $(CYGPATH_W) 'clientlib.c'; else $(CYGPATH_W) '$(srcdir)/clientlib.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblrm_la_CFLAGS) $(CFLAGS) -c -o liblrm_la-lrm_msg.lo `test -f 'lrm_msg.c' || echo '$(srcdir)/'`lrm_msg.c
 
 liblrm_la-clientlib.lo: clientlib.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblrm_la_CFLAGS) $(CFLAGS) -MT liblrm_la-clientlib.lo -MD -MP -MF "$(DEPDIR)/liblrm_la-clientlib.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o liblrm_la-clientlib.lo `test -f 'clientlib.c' || echo '$(srcdir)/'`clientlib.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/liblrm_la-clientlib.Tpo" "$(DEPDIR)/liblrm_la-clientlib.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/liblrm_la-clientlib.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblrm_la_CFLAGS) $(CFLAGS) -MT liblrm_la-clientlib.lo -MD -MP -MF $(DEPDIR)/liblrm_la-clientlib.Tpo -c -o liblrm_la-clientlib.lo `test -f 'clientlib.c' || echo '$(srcdir)/'`clientlib.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/liblrm_la-clientlib.Tpo $(DEPDIR)/liblrm_la-clientlib.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='clientlib.c' object='liblrm_la-clientlib.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/liblrm_la-clientlib.Plo' tmpdepfile='$(DEPDIR)/liblrm_la-clientlib.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblrm_la_CFLAGS) $(CFLAGS) -c -o liblrm_la-clientlib.lo `test -f 'clientlib.c' || echo '$(srcdir)/'`clientlib.c
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblrm_la_CFLAGS) $(CFLAGS) -c -o liblrm_la-clientlib.lo `test -f 'clientlib.c' || echo '$(srcdir)/'`clientlib.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -561,18 +491,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -581,6 +499,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -592,10 +511,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -618,28 +538,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -653,9 +568,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	for dir in "$(DESTDIR)$(libdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -675,7 +591,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -690,24 +606,34 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-exec-local install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -728,20 +654,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+uninstall-am: uninstall-libLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-exec-local install-info install-info-am \
-	install-libLTLIBRARIES install-man install-strip installcheck \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-exec-local \
+	install-html install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-libLTLIBRARIES
+	tags uninstall uninstall-am uninstall-libLTLIBRARIES
 
 
 install-exec-local:
--- a/lib/mgmt/Makefile.in
+++ b/lib/mgmt/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,12 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +31,99 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = lib/mgmt
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(guilibdir)" "$(DESTDIR)$(libdir)" \
+	"$(DESTDIR)$(guilibdir)"
+guilibLTLIBRARIES_INSTALL = $(INSTALL)
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(guilib_LTLIBRARIES) $(lib_LTLIBRARIES)
+_pymgmt_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
+am__pymgmt_la_OBJECTS = _pymgmt_la-pymgmt_wrap.lo \
+	_pymgmt_la-mgmt_client_lib.lo _pymgmt_la-mgmt_tls_lib.lo \
+	_pymgmt_la-mgmt_common_lib.lo
+_pymgmt_la_OBJECTS = $(am__pymgmt_la_OBJECTS)
+_pymgmt_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(_pymgmt_la_CFLAGS) \
+	$(CFLAGS) $(_pymgmt_la_LDFLAGS) $(LDFLAGS) -o $@
+am__DEPENDENCIES_1 =
+am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
+libhbmgmtclient_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	libhbmgmttls.la $(top_builddir)/replace/libreplace.la
+am_libhbmgmtclient_la_OBJECTS = libhbmgmtclient_la-mgmt_client_lib.lo
+libhbmgmtclient_la_OBJECTS = $(am_libhbmgmtclient_la_OBJECTS)
+libhbmgmtclient_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(libhbmgmtclient_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+libhbmgmtcommon_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	$(top_builddir)/replace/libreplace.la
+am_libhbmgmtcommon_la_OBJECTS = libhbmgmtcommon_la-mgmt_common_lib.lo
+libhbmgmtcommon_la_OBJECTS = $(am_libhbmgmtcommon_la_OBJECTS)
+libhbmgmtcommon_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(libhbmgmtcommon_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+libhbmgmttls_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_libhbmgmttls_la_OBJECTS = libhbmgmttls_la-mgmt_tls_lib.lo
+libhbmgmttls_la_OBJECTS = $(am_libhbmgmttls_la_OBJECTS)
+libhbmgmttls_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libhbmgmttls_la_CFLAGS) \
+	$(CFLAGS) $(libhbmgmttls_la_LDFLAGS) $(LDFLAGS) -o $@
+guilibSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(guilib_SCRIPTS)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(_pymgmt_la_SOURCES) $(libhbmgmtclient_la_SOURCES) \
+	$(libhbmgmtcommon_la_SOURCES) $(libhbmgmttls_la_SOURCES)
+DIST_SOURCES = $(_pymgmt_la_SOURCES) $(libhbmgmtclient_la_SOURCES) \
+	$(libhbmgmtcommon_la_SOURCES) $(libhbmgmttls_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +146,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +189,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +200,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +208,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +227,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +235,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +270,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +290,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +300,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +309,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +329,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +351,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +366,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # Author: Sun Jiang Dong <sunjd@cn.ibm.com>
@@ -360,13 +395,11 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
                        			-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
 					-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 					-I$(top_builddir)          -I$(top_srcdir)
 
-
 halibdir = $(libdir)/@HB_PKG@
 guilibdir = $(libdir)/heartbeat-gui
 havarlibdir = $(localstatedir)/lib/@HB_PKG@
@@ -374,163 +407,128 @@
 MGMT_DIR = mgmt
 mgmtdir = $(HA_VARLIBDIR)/$(HB_PKG)/$(MGMT_DIR)
 apigid = @HA_APIGID@
-
 EXTRA_DIST = pymgmt.i
-
 lib_LTLIBRARIES = libhbmgmttls.la libhbmgmtclient.la libhbmgmtcommon.la
 libhbmgmttls_la_SOURCES = mgmt_tls_lib.c
 libhbmgmttls_la_LIBADD = $(COMMONLIBS)
 libhbmgmttls_la_LDFLAGS = $(GNUTLSLIBS)
 libhbmgmttls_la_CFLAGS = $(INCLUDES) $(GNUTLSHEAD)
-
 libhbmgmtclient_la_SOURCES = mgmt_client_lib.c
 libhbmgmtclient_la_LIBADD = $(COMMONLIBS) libhbmgmttls.la $(top_builddir)/replace/libreplace.la
 libhbmgmtclient_la_CFLAGS = $(INCLUDES)
-
 libhbmgmtcommon_la_SOURCES = mgmt_common_lib.c
 libhbmgmtcommon_la_LIBADD = $(COMMONLIBS) $(top_builddir)/replace/libreplace.la
 libhbmgmtcommon_la_CFLAGS = $(INCLUDES)
-
 guilib_LTLIBRARIES = _pymgmt.la
 _pymgmt_la_SOURCES = pymgmt_wrap.c mgmt_client_lib.c mgmt_tls_lib.c mgmt_common_lib.c
 _pymgmt_la_CFLAGS = @PYTHON_INCLUDES@ -I$(top_builddir)/include -w
 _pymgmt_la_LDFLAGS = -module $(GNUTLSLIBS)
 _pymgmt_la_LIBADD = $(top_builddir)/replace/libreplace.la
-
 guilib_SCRIPTS = pymgmt.py
-subdir = lib/mgmt
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(guilib_LTLIBRARIES) $(lib_LTLIBRARIES)
-
-_pymgmt_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
-am__pymgmt_la_OBJECTS = _pymgmt_la-pymgmt_wrap.lo \
-	_pymgmt_la-mgmt_client_lib.lo _pymgmt_la-mgmt_tls_lib.lo \
-	_pymgmt_la-mgmt_common_lib.lo
-_pymgmt_la_OBJECTS = $(am__pymgmt_la_OBJECTS)
-libhbmgmtclient_la_LDFLAGS =
-libhbmgmtclient_la_DEPENDENCIES = libhbmgmttls.la \
-	$(top_builddir)/replace/libreplace.la
-am_libhbmgmtclient_la_OBJECTS = libhbmgmtclient_la-mgmt_client_lib.lo
-libhbmgmtclient_la_OBJECTS = $(am_libhbmgmtclient_la_OBJECTS)
-libhbmgmtcommon_la_LDFLAGS =
-libhbmgmtcommon_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
-am_libhbmgmtcommon_la_OBJECTS = libhbmgmtcommon_la-mgmt_common_lib.lo
-libhbmgmtcommon_la_OBJECTS = $(am_libhbmgmtcommon_la_OBJECTS)
-libhbmgmttls_la_DEPENDENCIES =
-am_libhbmgmttls_la_OBJECTS = libhbmgmttls_la-mgmt_tls_lib.lo
-libhbmgmttls_la_OBJECTS = $(am_libhbmgmttls_la_OBJECTS)
-SCRIPTS = $(guilib_SCRIPTS)
-
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/_pymgmt_la-mgmt_client_lib.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/_pymgmt_la-mgmt_common_lib.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/_pymgmt_la-mgmt_tls_lib.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/_pymgmt_la-pymgmt_wrap.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libhbmgmtclient_la-mgmt_client_lib.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libhbmgmtcommon_la-mgmt_common_lib.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libhbmgmttls_la-mgmt_tls_lib.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(_pymgmt_la_SOURCES) $(libhbmgmtclient_la_SOURCES) \
-	$(libhbmgmtcommon_la_SOURCES) $(libhbmgmttls_la_SOURCES)
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(_pymgmt_la_SOURCES) $(libhbmgmtclient_la_SOURCES) $(libhbmgmtcommon_la_SOURCES) $(libhbmgmttls_la_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/mgmt/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/mgmt/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-guilibLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-guilibLTLIBRARIES: $(guilib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(guilibdir)
+	test -z "$(guilibdir)" || $(MKDIR_P) "$(DESTDIR)$(guilibdir)"
 	@list='$(guilib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(guilibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(guilibdir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(guilibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(guilibdir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(guilibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(guilibdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(guilibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(guilibdir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-guilibLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(guilib_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(guilibdir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(guilibdir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(guilibdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(guilibdir)/$$p"; \
 	done
 
 clean-guilibLTLIBRARIES:
 	-test -z "$(guilib_LTLIBRARIES)" || rm -f $(guilib_LTLIBRARIES)
 	@list='$(guilib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libLTLIBRARIES_INSTALL = $(INSTALL)
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 _pymgmt.la: $(_pymgmt_la_OBJECTS) $(_pymgmt_la_DEPENDENCIES) 
-	$(LINK) -rpath $(guilibdir) $(_pymgmt_la_LDFLAGS) $(_pymgmt_la_OBJECTS) $(_pymgmt_la_LIBADD) $(LIBS)
+	$(_pymgmt_la_LINK) -rpath $(guilibdir) $(_pymgmt_la_OBJECTS) $(_pymgmt_la_LIBADD) $(LIBS)
 libhbmgmtclient.la: $(libhbmgmtclient_la_OBJECTS) $(libhbmgmtclient_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libhbmgmtclient_la_LDFLAGS) $(libhbmgmtclient_la_OBJECTS) $(libhbmgmtclient_la_LIBADD) $(LIBS)
+	$(libhbmgmtclient_la_LINK) -rpath $(libdir) $(libhbmgmtclient_la_OBJECTS) $(libhbmgmtclient_la_LIBADD) $(LIBS)
 libhbmgmtcommon.la: $(libhbmgmtcommon_la_OBJECTS) $(libhbmgmtcommon_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libhbmgmtcommon_la_LDFLAGS) $(libhbmgmtcommon_la_OBJECTS) $(libhbmgmtcommon_la_LIBADD) $(LIBS)
+	$(libhbmgmtcommon_la_LINK) -rpath $(libdir) $(libhbmgmtcommon_la_OBJECTS) $(libhbmgmtcommon_la_LIBADD) $(LIBS)
 libhbmgmttls.la: $(libhbmgmttls_la_OBJECTS) $(libhbmgmttls_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libhbmgmttls_la_LDFLAGS) $(libhbmgmttls_la_OBJECTS) $(libhbmgmttls_la_LIBADD) $(LIBS)
-guilibSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+	$(libhbmgmttls_la_LINK) -rpath $(libdir) $(libhbmgmttls_la_OBJECTS) $(libhbmgmttls_la_LIBADD) $(LIBS)
 install-guilibSCRIPTS: $(guilib_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(guilibdir)
+	test -z "$(guilibdir)" || $(MKDIR_P) "$(DESTDIR)$(guilibdir)"
 	@list='$(guilib_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(guilibSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(guilibdir)/$$f"; \
-	    $(guilibSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(guilibdir)/$$f; \
+	    echo " $(guilibSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(guilibdir)/$$f'"; \
+	    $(guilibSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(guilibdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -538,12 +536,12 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(guilib_SCRIPTS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f $(DESTDIR)$(guilibdir)/$$f"; \
-	  rm -f $(DESTDIR)$(guilibdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(guilibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(guilibdir)/$$f"; \
 	done
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -557,268 +555,74 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhbmgmttls_la-mgmt_tls_lib.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-_pymgmt_la-pymgmt_wrap.o: pymgmt_wrap.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -MT _pymgmt_la-pymgmt_wrap.o -MD -MP -MF "$(DEPDIR)/_pymgmt_la-pymgmt_wrap.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o _pymgmt_la-pymgmt_wrap.o `test -f 'pymgmt_wrap.c' || echo '$(srcdir)/'`pymgmt_wrap.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_pymgmt_la-pymgmt_wrap.Tpo" "$(DEPDIR)/_pymgmt_la-pymgmt_wrap.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/_pymgmt_la-pymgmt_wrap.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pymgmt_wrap.c' object='_pymgmt_la-pymgmt_wrap.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_pymgmt_la-pymgmt_wrap.Po' tmpdepfile='$(DEPDIR)/_pymgmt_la-pymgmt_wrap.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -c -o _pymgmt_la-pymgmt_wrap.o `test -f 'pymgmt_wrap.c' || echo '$(srcdir)/'`pymgmt_wrap.c
-
-_pymgmt_la-pymgmt_wrap.obj: pymgmt_wrap.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -MT _pymgmt_la-pymgmt_wrap.obj -MD -MP -MF "$(DEPDIR)/_pymgmt_la-pymgmt_wrap.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o _pymgmt_la-pymgmt_wrap.obj `if test -f 'pymgmt_wrap.c'; then $(CYGPATH_W) 'pymgmt_wrap.c'; else $(CYGPATH_W) '$(srcdir)/pymgmt_wrap.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_pymgmt_la-pymgmt_wrap.Tpo" "$(DEPDIR)/_pymgmt_la-pymgmt_wrap.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/_pymgmt_la-pymgmt_wrap.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pymgmt_wrap.c' object='_pymgmt_la-pymgmt_wrap.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_pymgmt_la-pymgmt_wrap.Po' tmpdepfile='$(DEPDIR)/_pymgmt_la-pymgmt_wrap.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -c -o _pymgmt_la-pymgmt_wrap.obj `if test -f 'pymgmt_wrap.c'; then $(CYGPATH_W) 'pymgmt_wrap.c'; else $(CYGPATH_W) '$(srcdir)/pymgmt_wrap.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 _pymgmt_la-pymgmt_wrap.lo: pymgmt_wrap.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -MT _pymgmt_la-pymgmt_wrap.lo -MD -MP -MF "$(DEPDIR)/_pymgmt_la-pymgmt_wrap.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o _pymgmt_la-pymgmt_wrap.lo `test -f 'pymgmt_wrap.c' || echo '$(srcdir)/'`pymgmt_wrap.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_pymgmt_la-pymgmt_wrap.Tpo" "$(DEPDIR)/_pymgmt_la-pymgmt_wrap.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/_pymgmt_la-pymgmt_wrap.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -MT _pymgmt_la-pymgmt_wrap.lo -MD -MP -MF $(DEPDIR)/_pymgmt_la-pymgmt_wrap.Tpo -c -o _pymgmt_la-pymgmt_wrap.lo `test -f 'pymgmt_wrap.c' || echo '$(srcdir)/'`pymgmt_wrap.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/_pymgmt_la-pymgmt_wrap.Tpo $(DEPDIR)/_pymgmt_la-pymgmt_wrap.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pymgmt_wrap.c' object='_pymgmt_la-pymgmt_wrap.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_pymgmt_la-pymgmt_wrap.Plo' tmpdepfile='$(DEPDIR)/_pymgmt_la-pymgmt_wrap.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -c -o _pymgmt_la-pymgmt_wrap.lo `test -f 'pymgmt_wrap.c' || echo '$(srcdir)/'`pymgmt_wrap.c
-
-_pymgmt_la-mgmt_client_lib.o: mgmt_client_lib.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -MT _pymgmt_la-mgmt_client_lib.o -MD -MP -MF "$(DEPDIR)/_pymgmt_la-mgmt_client_lib.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o _pymgmt_la-mgmt_client_lib.o `test -f 'mgmt_client_lib.c' || echo '$(srcdir)/'`mgmt_client_lib.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_pymgmt_la-mgmt_client_lib.Tpo" "$(DEPDIR)/_pymgmt_la-mgmt_client_lib.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/_pymgmt_la-mgmt_client_lib.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgmt_client_lib.c' object='_pymgmt_la-mgmt_client_lib.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_pymgmt_la-mgmt_client_lib.Po' tmpdepfile='$(DEPDIR)/_pymgmt_la-mgmt_client_lib.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -c -o _pymgmt_la-mgmt_client_lib.o `test -f 'mgmt_client_lib.c' || echo '$(srcdir)/'`mgmt_client_lib.c
-
-_pymgmt_la-mgmt_client_lib.obj: mgmt_client_lib.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -MT _pymgmt_la-mgmt_client_lib.obj -MD -MP -MF "$(DEPDIR)/_pymgmt_la-mgmt_client_lib.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o _pymgmt_la-mgmt_client_lib.obj `if test -f 'mgmt_client_lib.c'; then $(CYGPATH_W) 'mgmt_client_lib.c'; else $(CYGPATH_W) '$(srcdir)/mgmt_client_lib.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_pymgmt_la-mgmt_client_lib.Tpo" "$(DEPDIR)/_pymgmt_la-mgmt_client_lib.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/_pymgmt_la-mgmt_client_lib.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgmt_client_lib.c' object='_pymgmt_la-mgmt_client_lib.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_pymgmt_la-mgmt_client_lib.Po' tmpdepfile='$(DEPDIR)/_pymgmt_la-mgmt_client_lib.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -c -o _pymgmt_la-mgmt_client_lib.obj `if test -f 'mgmt_client_lib.c'; then $(CYGPATH_W) 'mgmt_client_lib.c'; else $(CYGPATH_W) '$(srcdir)/mgmt_client_lib.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -c -o _pymgmt_la-pymgmt_wrap.lo `test -f 'pymgmt_wrap.c' || echo '$(srcdir)/'`pymgmt_wrap.c
 
 _pymgmt_la-mgmt_client_lib.lo: mgmt_client_lib.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -MT _pymgmt_la-mgmt_client_lib.lo -MD -MP -MF "$(DEPDIR)/_pymgmt_la-mgmt_client_lib.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o _pymgmt_la-mgmt_client_lib.lo `test -f 'mgmt_client_lib.c' || echo '$(srcdir)/'`mgmt_client_lib.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_pymgmt_la-mgmt_client_lib.Tpo" "$(DEPDIR)/_pymgmt_la-mgmt_client_lib.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/_pymgmt_la-mgmt_client_lib.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -MT _pymgmt_la-mgmt_client_lib.lo -MD -MP -MF $(DEPDIR)/_pymgmt_la-mgmt_client_lib.Tpo -c -o _pymgmt_la-mgmt_client_lib.lo `test -f 'mgmt_client_lib.c' || echo '$(srcdir)/'`mgmt_client_lib.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/_pymgmt_la-mgmt_client_lib.Tpo $(DEPDIR)/_pymgmt_la-mgmt_client_lib.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgmt_client_lib.c' object='_pymgmt_la-mgmt_client_lib.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_pymgmt_la-mgmt_client_lib.Plo' tmpdepfile='$(DEPDIR)/_pymgmt_la-mgmt_client_lib.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -c -o _pymgmt_la-mgmt_client_lib.lo `test -f 'mgmt_client_lib.c' || echo '$(srcdir)/'`mgmt_client_lib.c
-
-_pymgmt_la-mgmt_tls_lib.o: mgmt_tls_lib.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -MT _pymgmt_la-mgmt_tls_lib.o -MD -MP -MF "$(DEPDIR)/_pymgmt_la-mgmt_tls_lib.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o _pymgmt_la-mgmt_tls_lib.o `test -f 'mgmt_tls_lib.c' || echo '$(srcdir)/'`mgmt_tls_lib.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_pymgmt_la-mgmt_tls_lib.Tpo" "$(DEPDIR)/_pymgmt_la-mgmt_tls_lib.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/_pymgmt_la-mgmt_tls_lib.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgmt_tls_lib.c' object='_pymgmt_la-mgmt_tls_lib.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_pymgmt_la-mgmt_tls_lib.Po' tmpdepfile='$(DEPDIR)/_pymgmt_la-mgmt_tls_lib.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -c -o _pymgmt_la-mgmt_tls_lib.o `test -f 'mgmt_tls_lib.c' || echo '$(srcdir)/'`mgmt_tls_lib.c
-
-_pymgmt_la-mgmt_tls_lib.obj: mgmt_tls_lib.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -MT _pymgmt_la-mgmt_tls_lib.obj -MD -MP -MF "$(DEPDIR)/_pymgmt_la-mgmt_tls_lib.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o _pymgmt_la-mgmt_tls_lib.obj `if test -f 'mgmt_tls_lib.c'; then $(CYGPATH_W) 'mgmt_tls_lib.c'; else $(CYGPATH_W) '$(srcdir)/mgmt_tls_lib.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_pymgmt_la-mgmt_tls_lib.Tpo" "$(DEPDIR)/_pymgmt_la-mgmt_tls_lib.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/_pymgmt_la-mgmt_tls_lib.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgmt_tls_lib.c' object='_pymgmt_la-mgmt_tls_lib.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_pymgmt_la-mgmt_tls_lib.Po' tmpdepfile='$(DEPDIR)/_pymgmt_la-mgmt_tls_lib.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -c -o _pymgmt_la-mgmt_tls_lib.obj `if test -f 'mgmt_tls_lib.c'; then $(CYGPATH_W) 'mgmt_tls_lib.c'; else $(CYGPATH_W) '$(srcdir)/mgmt_tls_lib.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -c -o _pymgmt_la-mgmt_client_lib.lo `test -f 'mgmt_client_lib.c' || echo '$(srcdir)/'`mgmt_client_lib.c
 
 _pymgmt_la-mgmt_tls_lib.lo: mgmt_tls_lib.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -MT _pymgmt_la-mgmt_tls_lib.lo -MD -MP -MF "$(DEPDIR)/_pymgmt_la-mgmt_tls_lib.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o _pymgmt_la-mgmt_tls_lib.lo `test -f 'mgmt_tls_lib.c' || echo '$(srcdir)/'`mgmt_tls_lib.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_pymgmt_la-mgmt_tls_lib.Tpo" "$(DEPDIR)/_pymgmt_la-mgmt_tls_lib.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/_pymgmt_la-mgmt_tls_lib.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -MT _pymgmt_la-mgmt_tls_lib.lo -MD -MP -MF $(DEPDIR)/_pymgmt_la-mgmt_tls_lib.Tpo -c -o _pymgmt_la-mgmt_tls_lib.lo `test -f 'mgmt_tls_lib.c' || echo '$(srcdir)/'`mgmt_tls_lib.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/_pymgmt_la-mgmt_tls_lib.Tpo $(DEPDIR)/_pymgmt_la-mgmt_tls_lib.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgmt_tls_lib.c' object='_pymgmt_la-mgmt_tls_lib.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_pymgmt_la-mgmt_tls_lib.Plo' tmpdepfile='$(DEPDIR)/_pymgmt_la-mgmt_tls_lib.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -c -o _pymgmt_la-mgmt_tls_lib.lo `test -f 'mgmt_tls_lib.c' || echo '$(srcdir)/'`mgmt_tls_lib.c
-
-_pymgmt_la-mgmt_common_lib.o: mgmt_common_lib.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -MT _pymgmt_la-mgmt_common_lib.o -MD -MP -MF "$(DEPDIR)/_pymgmt_la-mgmt_common_lib.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o _pymgmt_la-mgmt_common_lib.o `test -f 'mgmt_common_lib.c' || echo '$(srcdir)/'`mgmt_common_lib.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_pymgmt_la-mgmt_common_lib.Tpo" "$(DEPDIR)/_pymgmt_la-mgmt_common_lib.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/_pymgmt_la-mgmt_common_lib.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgmt_common_lib.c' object='_pymgmt_la-mgmt_common_lib.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_pymgmt_la-mgmt_common_lib.Po' tmpdepfile='$(DEPDIR)/_pymgmt_la-mgmt_common_lib.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -c -o _pymgmt_la-mgmt_common_lib.o `test -f 'mgmt_common_lib.c' || echo '$(srcdir)/'`mgmt_common_lib.c
-
-_pymgmt_la-mgmt_common_lib.obj: mgmt_common_lib.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -MT _pymgmt_la-mgmt_common_lib.obj -MD -MP -MF "$(DEPDIR)/_pymgmt_la-mgmt_common_lib.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o _pymgmt_la-mgmt_common_lib.obj `if test -f 'mgmt_common_lib.c'; then $(CYGPATH_W) 'mgmt_common_lib.c'; else $(CYGPATH_W) '$(srcdir)/mgmt_common_lib.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_pymgmt_la-mgmt_common_lib.Tpo" "$(DEPDIR)/_pymgmt_la-mgmt_common_lib.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/_pymgmt_la-mgmt_common_lib.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgmt_common_lib.c' object='_pymgmt_la-mgmt_common_lib.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_pymgmt_la-mgmt_common_lib.Po' tmpdepfile='$(DEPDIR)/_pymgmt_la-mgmt_common_lib.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -c -o _pymgmt_la-mgmt_common_lib.obj `if test -f 'mgmt_common_lib.c'; then $(CYGPATH_W) 'mgmt_common_lib.c'; else $(CYGPATH_W) '$(srcdir)/mgmt_common_lib.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -c -o _pymgmt_la-mgmt_tls_lib.lo `test -f 'mgmt_tls_lib.c' || echo '$(srcdir)/'`mgmt_tls_lib.c
 
 _pymgmt_la-mgmt_common_lib.lo: mgmt_common_lib.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -MT _pymgmt_la-mgmt_common_lib.lo -MD -MP -MF "$(DEPDIR)/_pymgmt_la-mgmt_common_lib.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o _pymgmt_la-mgmt_common_lib.lo `test -f 'mgmt_common_lib.c' || echo '$(srcdir)/'`mgmt_common_lib.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_pymgmt_la-mgmt_common_lib.Tpo" "$(DEPDIR)/_pymgmt_la-mgmt_common_lib.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/_pymgmt_la-mgmt_common_lib.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -MT _pymgmt_la-mgmt_common_lib.lo -MD -MP -MF $(DEPDIR)/_pymgmt_la-mgmt_common_lib.Tpo -c -o _pymgmt_la-mgmt_common_lib.lo `test -f 'mgmt_common_lib.c' || echo '$(srcdir)/'`mgmt_common_lib.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/_pymgmt_la-mgmt_common_lib.Tpo $(DEPDIR)/_pymgmt_la-mgmt_common_lib.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgmt_common_lib.c' object='_pymgmt_la-mgmt_common_lib.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_pymgmt_la-mgmt_common_lib.Plo' tmpdepfile='$(DEPDIR)/_pymgmt_la-mgmt_common_lib.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -c -o _pymgmt_la-mgmt_common_lib.lo `test -f 'mgmt_common_lib.c' || echo '$(srcdir)/'`mgmt_common_lib.c
-
-libhbmgmtclient_la-mgmt_client_lib.o: mgmt_client_lib.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmtclient_la_CFLAGS) $(CFLAGS) -MT libhbmgmtclient_la-mgmt_client_lib.o -MD -MP -MF "$(DEPDIR)/libhbmgmtclient_la-mgmt_client_lib.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libhbmgmtclient_la-mgmt_client_lib.o `test -f 'mgmt_client_lib.c' || echo '$(srcdir)/'`mgmt_client_lib.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libhbmgmtclient_la-mgmt_client_lib.Tpo" "$(DEPDIR)/libhbmgmtclient_la-mgmt_client_lib.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libhbmgmtclient_la-mgmt_client_lib.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgmt_client_lib.c' object='libhbmgmtclient_la-mgmt_client_lib.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libhbmgmtclient_la-mgmt_client_lib.Po' tmpdepfile='$(DEPDIR)/libhbmgmtclient_la-mgmt_client_lib.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmtclient_la_CFLAGS) $(CFLAGS) -c -o libhbmgmtclient_la-mgmt_client_lib.o `test -f 'mgmt_client_lib.c' || echo '$(srcdir)/'`mgmt_client_lib.c
-
-libhbmgmtclient_la-mgmt_client_lib.obj: mgmt_client_lib.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmtclient_la_CFLAGS) $(CFLAGS) -MT libhbmgmtclient_la-mgmt_client_lib.obj -MD -MP -MF "$(DEPDIR)/libhbmgmtclient_la-mgmt_client_lib.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libhbmgmtclient_la-mgmt_client_lib.obj `if test -f 'mgmt_client_lib.c'; then $(CYGPATH_W) 'mgmt_client_lib.c'; else $(CYGPATH_W) '$(srcdir)/mgmt_client_lib.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libhbmgmtclient_la-mgmt_client_lib.Tpo" "$(DEPDIR)/libhbmgmtclient_la-mgmt_client_lib.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libhbmgmtclient_la-mgmt_client_lib.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgmt_client_lib.c' object='libhbmgmtclient_la-mgmt_client_lib.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libhbmgmtclient_la-mgmt_client_lib.Po' tmpdepfile='$(DEPDIR)/libhbmgmtclient_la-mgmt_client_lib.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmtclient_la_CFLAGS) $(CFLAGS) -c -o libhbmgmtclient_la-mgmt_client_lib.obj `if test -f 'mgmt_client_lib.c'; then $(CYGPATH_W) 'mgmt_client_lib.c'; else $(CYGPATH_W) '$(srcdir)/mgmt_client_lib.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_pymgmt_la_CFLAGS) $(CFLAGS) -c -o _pymgmt_la-mgmt_common_lib.lo `test -f 'mgmt_common_lib.c' || echo '$(srcdir)/'`mgmt_common_lib.c
 
 libhbmgmtclient_la-mgmt_client_lib.lo: mgmt_client_lib.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmtclient_la_CFLAGS) $(CFLAGS) -MT libhbmgmtclient_la-mgmt_client_lib.lo -MD -MP -MF "$(DEPDIR)/libhbmgmtclient_la-mgmt_client_lib.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libhbmgmtclient_la-mgmt_client_lib.lo `test -f 'mgmt_client_lib.c' || echo '$(srcdir)/'`mgmt_client_lib.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libhbmgmtclient_la-mgmt_client_lib.Tpo" "$(DEPDIR)/libhbmgmtclient_la-mgmt_client_lib.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libhbmgmtclient_la-mgmt_client_lib.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmtclient_la_CFLAGS) $(CFLAGS) -MT libhbmgmtclient_la-mgmt_client_lib.lo -MD -MP -MF $(DEPDIR)/libhbmgmtclient_la-mgmt_client_lib.Tpo -c -o libhbmgmtclient_la-mgmt_client_lib.lo `test -f 'mgmt_client_lib.c' || echo '$(srcdir)/'`mgmt_client_lib.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libhbmgmtclient_la-mgmt_client_lib.Tpo $(DEPDIR)/libhbmgmtclient_la-mgmt_client_lib.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgmt_client_lib.c' object='libhbmgmtclient_la-mgmt_client_lib.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libhbmgmtclient_la-mgmt_client_lib.Plo' tmpdepfile='$(DEPDIR)/libhbmgmtclient_la-mgmt_client_lib.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmtclient_la_CFLAGS) $(CFLAGS) -c -o libhbmgmtclient_la-mgmt_client_lib.lo `test -f 'mgmt_client_lib.c' || echo '$(srcdir)/'`mgmt_client_lib.c
-
-libhbmgmtcommon_la-mgmt_common_lib.o: mgmt_common_lib.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmtcommon_la_CFLAGS) $(CFLAGS) -MT libhbmgmtcommon_la-mgmt_common_lib.o -MD -MP -MF "$(DEPDIR)/libhbmgmtcommon_la-mgmt_common_lib.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libhbmgmtcommon_la-mgmt_common_lib.o `test -f 'mgmt_common_lib.c' || echo '$(srcdir)/'`mgmt_common_lib.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libhbmgmtcommon_la-mgmt_common_lib.Tpo" "$(DEPDIR)/libhbmgmtcommon_la-mgmt_common_lib.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libhbmgmtcommon_la-mgmt_common_lib.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgmt_common_lib.c' object='libhbmgmtcommon_la-mgmt_common_lib.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libhbmgmtcommon_la-mgmt_common_lib.Po' tmpdepfile='$(DEPDIR)/libhbmgmtcommon_la-mgmt_common_lib.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmtcommon_la_CFLAGS) $(CFLAGS) -c -o libhbmgmtcommon_la-mgmt_common_lib.o `test -f 'mgmt_common_lib.c' || echo '$(srcdir)/'`mgmt_common_lib.c
-
-libhbmgmtcommon_la-mgmt_common_lib.obj: mgmt_common_lib.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmtcommon_la_CFLAGS) $(CFLAGS) -MT libhbmgmtcommon_la-mgmt_common_lib.obj -MD -MP -MF "$(DEPDIR)/libhbmgmtcommon_la-mgmt_common_lib.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libhbmgmtcommon_la-mgmt_common_lib.obj `if test -f 'mgmt_common_lib.c'; then $(CYGPATH_W) 'mgmt_common_lib.c'; else $(CYGPATH_W) '$(srcdir)/mgmt_common_lib.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libhbmgmtcommon_la-mgmt_common_lib.Tpo" "$(DEPDIR)/libhbmgmtcommon_la-mgmt_common_lib.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libhbmgmtcommon_la-mgmt_common_lib.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgmt_common_lib.c' object='libhbmgmtcommon_la-mgmt_common_lib.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libhbmgmtcommon_la-mgmt_common_lib.Po' tmpdepfile='$(DEPDIR)/libhbmgmtcommon_la-mgmt_common_lib.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmtcommon_la_CFLAGS) $(CFLAGS) -c -o libhbmgmtcommon_la-mgmt_common_lib.obj `if test -f 'mgmt_common_lib.c'; then $(CYGPATH_W) 'mgmt_common_lib.c'; else $(CYGPATH_W) '$(srcdir)/mgmt_common_lib.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmtclient_la_CFLAGS) $(CFLAGS) -c -o libhbmgmtclient_la-mgmt_client_lib.lo `test -f 'mgmt_client_lib.c' || echo '$(srcdir)/'`mgmt_client_lib.c
 
 libhbmgmtcommon_la-mgmt_common_lib.lo: mgmt_common_lib.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmtcommon_la_CFLAGS) $(CFLAGS) -MT libhbmgmtcommon_la-mgmt_common_lib.lo -MD -MP -MF "$(DEPDIR)/libhbmgmtcommon_la-mgmt_common_lib.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libhbmgmtcommon_la-mgmt_common_lib.lo `test -f 'mgmt_common_lib.c' || echo '$(srcdir)/'`mgmt_common_lib.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libhbmgmtcommon_la-mgmt_common_lib.Tpo" "$(DEPDIR)/libhbmgmtcommon_la-mgmt_common_lib.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libhbmgmtcommon_la-mgmt_common_lib.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmtcommon_la_CFLAGS) $(CFLAGS) -MT libhbmgmtcommon_la-mgmt_common_lib.lo -MD -MP -MF $(DEPDIR)/libhbmgmtcommon_la-mgmt_common_lib.Tpo -c -o libhbmgmtcommon_la-mgmt_common_lib.lo `test -f 'mgmt_common_lib.c' || echo '$(srcdir)/'`mgmt_common_lib.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libhbmgmtcommon_la-mgmt_common_lib.Tpo $(DEPDIR)/libhbmgmtcommon_la-mgmt_common_lib.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgmt_common_lib.c' object='libhbmgmtcommon_la-mgmt_common_lib.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libhbmgmtcommon_la-mgmt_common_lib.Plo' tmpdepfile='$(DEPDIR)/libhbmgmtcommon_la-mgmt_common_lib.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmtcommon_la_CFLAGS) $(CFLAGS) -c -o libhbmgmtcommon_la-mgmt_common_lib.lo `test -f 'mgmt_common_lib.c' || echo '$(srcdir)/'`mgmt_common_lib.c
-
-libhbmgmttls_la-mgmt_tls_lib.o: mgmt_tls_lib.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmttls_la_CFLAGS) $(CFLAGS) -MT libhbmgmttls_la-mgmt_tls_lib.o -MD -MP -MF "$(DEPDIR)/libhbmgmttls_la-mgmt_tls_lib.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libhbmgmttls_la-mgmt_tls_lib.o `test -f 'mgmt_tls_lib.c' || echo '$(srcdir)/'`mgmt_tls_lib.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libhbmgmttls_la-mgmt_tls_lib.Tpo" "$(DEPDIR)/libhbmgmttls_la-mgmt_tls_lib.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libhbmgmttls_la-mgmt_tls_lib.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgmt_tls_lib.c' object='libhbmgmttls_la-mgmt_tls_lib.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libhbmgmttls_la-mgmt_tls_lib.Po' tmpdepfile='$(DEPDIR)/libhbmgmttls_la-mgmt_tls_lib.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmttls_la_CFLAGS) $(CFLAGS) -c -o libhbmgmttls_la-mgmt_tls_lib.o `test -f 'mgmt_tls_lib.c' || echo '$(srcdir)/'`mgmt_tls_lib.c
-
-libhbmgmttls_la-mgmt_tls_lib.obj: mgmt_tls_lib.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmttls_la_CFLAGS) $(CFLAGS) -MT libhbmgmttls_la-mgmt_tls_lib.obj -MD -MP -MF "$(DEPDIR)/libhbmgmttls_la-mgmt_tls_lib.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libhbmgmttls_la-mgmt_tls_lib.obj `if test -f 'mgmt_tls_lib.c'; then $(CYGPATH_W) 'mgmt_tls_lib.c'; else $(CYGPATH_W) '$(srcdir)/mgmt_tls_lib.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libhbmgmttls_la-mgmt_tls_lib.Tpo" "$(DEPDIR)/libhbmgmttls_la-mgmt_tls_lib.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libhbmgmttls_la-mgmt_tls_lib.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgmt_tls_lib.c' object='libhbmgmttls_la-mgmt_tls_lib.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libhbmgmttls_la-mgmt_tls_lib.Po' tmpdepfile='$(DEPDIR)/libhbmgmttls_la-mgmt_tls_lib.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmttls_la_CFLAGS) $(CFLAGS) -c -o libhbmgmttls_la-mgmt_tls_lib.obj `if test -f 'mgmt_tls_lib.c'; then $(CYGPATH_W) 'mgmt_tls_lib.c'; else $(CYGPATH_W) '$(srcdir)/mgmt_tls_lib.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmtcommon_la_CFLAGS) $(CFLAGS) -c -o libhbmgmtcommon_la-mgmt_common_lib.lo `test -f 'mgmt_common_lib.c' || echo '$(srcdir)/'`mgmt_common_lib.c
 
 libhbmgmttls_la-mgmt_tls_lib.lo: mgmt_tls_lib.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmttls_la_CFLAGS) $(CFLAGS) -MT libhbmgmttls_la-mgmt_tls_lib.lo -MD -MP -MF "$(DEPDIR)/libhbmgmttls_la-mgmt_tls_lib.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libhbmgmttls_la-mgmt_tls_lib.lo `test -f 'mgmt_tls_lib.c' || echo '$(srcdir)/'`mgmt_tls_lib.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libhbmgmttls_la-mgmt_tls_lib.Tpo" "$(DEPDIR)/libhbmgmttls_la-mgmt_tls_lib.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libhbmgmttls_la-mgmt_tls_lib.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmttls_la_CFLAGS) $(CFLAGS) -MT libhbmgmttls_la-mgmt_tls_lib.lo -MD -MP -MF $(DEPDIR)/libhbmgmttls_la-mgmt_tls_lib.Tpo -c -o libhbmgmttls_la-mgmt_tls_lib.lo `test -f 'mgmt_tls_lib.c' || echo '$(srcdir)/'`mgmt_tls_lib.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libhbmgmttls_la-mgmt_tls_lib.Tpo $(DEPDIR)/libhbmgmttls_la-mgmt_tls_lib.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgmt_tls_lib.c' object='libhbmgmttls_la-mgmt_tls_lib.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libhbmgmttls_la-mgmt_tls_lib.Plo' tmpdepfile='$(DEPDIR)/libhbmgmttls_la-mgmt_tls_lib.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmttls_la_CFLAGS) $(CFLAGS) -c -o libhbmgmttls_la-mgmt_tls_lib.lo `test -f 'mgmt_tls_lib.c' || echo '$(srcdir)/'`mgmt_tls_lib.c
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmttls_la_CFLAGS) $(CFLAGS) -c -o libhbmgmttls_la-mgmt_tls_lib.lo `test -f 'mgmt_tls_lib.c' || echo '$(srcdir)/'`mgmt_tls_lib.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -826,18 +630,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -846,6 +638,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -857,10 +650,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -883,28 +677,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -918,9 +707,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES) $(SCRIPTS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(guilibdir) $(DESTDIR)$(libdir) $(DESTDIR)$(guilibdir)
+	for dir in "$(DESTDIR)$(guilibdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(guilibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -940,7 +730,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -955,24 +745,34 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-guilibLTLIBRARIES install-guilibSCRIPTS
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-exec-local install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -994,22 +794,26 @@
 ps-am:
 
 uninstall-am: uninstall-guilibLTLIBRARIES uninstall-guilibSCRIPTS \
-	uninstall-info-am uninstall-libLTLIBRARIES
+	uninstall-libLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-guilibLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
 	ctags distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-exec-local \
-	install-guilibLTLIBRARIES install-guilibSCRIPTS install-info \
-	install-info-am install-libLTLIBRARIES install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
-	pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-guilibLTLIBRARIES uninstall-guilibSCRIPTS \
-	uninstall-info-am uninstall-libLTLIBRARIES
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-exec-local install-guilibLTLIBRARIES \
+	install-guilibSCRIPTS install-html install-html-am \
+	install-info install-info-am install-libLTLIBRARIES \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-guilibLTLIBRARIES \
+	uninstall-guilibSCRIPTS uninstall-libLTLIBRARIES
 
 
 pymgmt_wrap.c pymgmt.py: pymgmt.i
--- /dev/null
+++ b/lib/mgmt/pymgmt.py
@@ -0,0 +1,57 @@
+# This file was automatically generated by SWIG (http://www.swig.org).
+# Version 1.3.33
+#
+# Don't modify this file, modify the SWIG interface instead.
+# This file is compatible with both classic and new-style classes.
+
+import _pymgmt
+import new
+new_instancemethod = new.instancemethod
+try:
+    _swig_property = property
+except NameError:
+    pass # Python < 2.2 doesn't have 'property'.
+def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
+    if (name == "thisown"): return self.this.own(value)
+    if (name == "this"):
+        if type(value).__name__ == 'PySwigObject':
+            self.__dict__[name] = value
+            return
+    method = class_type.__swig_setmethods__.get(name,None)
+    if method: return method(self,value)
+    if (not static) or hasattr(self,name):
+        self.__dict__[name] = value
+    else:
+        raise AttributeError("You cannot add attributes to %s" % self)
+
+def _swig_setattr(self,class_type,name,value):
+    return _swig_setattr_nondynamic(self,class_type,name,value,0)
+
+def _swig_getattr(self,class_type,name):
+    if (name == "thisown"): return self.this.own()
+    method = class_type.__swig_getmethods__.get(name,None)
+    if method: return method(self)
+    raise AttributeError,name
+
+def _swig_repr(self):
+    try: strthis = "proxy of " + self.this.__repr__()
+    except: strthis = ""
+    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
+
+import types
+try:
+    _object = types.ObjectType
+    _newclass = 1
+except AttributeError:
+    class _object : pass
+    _newclass = 0
+del types
+
+
+mgmt_connect = _pymgmt.mgmt_connect
+mgmt_sendmsg = _pymgmt.mgmt_sendmsg
+mgmt_recvmsg = _pymgmt.mgmt_recvmsg
+mgmt_inputfd = _pymgmt.mgmt_inputfd
+mgmt_disconnect = _pymgmt.mgmt_disconnect
+
+
--- a/lib/mgmt/pymgmt_wrap.c
+++ b/lib/mgmt/pymgmt_wrap.c
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.31
+ * Version 1.3.33
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -17,14 +17,14 @@
 
 /* template workaround for compilers that cannot correctly implement the C++ standard */
 #ifndef SWIGTEMPLATEDISAMBIGUATOR
-# if defined(__SUNPRO_CC)
-#   if (__SUNPRO_CC <= 0x560)
-#     define SWIGTEMPLATEDISAMBIGUATOR template
-#   else
-#     define SWIGTEMPLATEDISAMBIGUATOR 
-#   endif
+# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# elif defined(__HP_aCC)
+/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
+/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
+#  define SWIGTEMPLATEDISAMBIGUATOR template
 # else
-#   define SWIGTEMPLATEDISAMBIGUATOR 
+#  define SWIGTEMPLATEDISAMBIGUATOR
 # endif
 #endif
 
@@ -107,6 +107,12 @@
 # define _CRT_SECURE_NO_DEPRECATE
 #endif
 
+/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
+#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
+# define _SCL_SECURE_NO_DEPRECATE
+#endif
+
+
 
 /* Python.h has to appear first */
 #include <Python.h>
@@ -343,7 +349,7 @@
     while ((*f2 == ' ') && (f2 != l2)) ++f2;
     if (*f1 != *f2) return (*f1 > *f2) ? 1 : -1;
   }
-  return (l1 - f1) - (l2 - f2);
+  return (int)((l1 - f1) - (l2 - f2));
 }
 
 /*
@@ -1090,14 +1096,14 @@
 /* Unpack the argument tuple */
 
 SWIGINTERN int
-SWIG_Python_UnpackTuple(PyObject *args, const char *name, int min, int max, PyObject **objs)
+SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssize_t max, PyObject **objs)
 {
   if (!args) {
     if (!min && !max) {
       return 1;
     } else {
       PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got none", 
-		   name, (min == max ? "" : "at least "), min);
+		   name, (min == max ? "" : "at least "), (int)min);
       return 0;
     }
   }  
@@ -1105,14 +1111,14 @@
     PyErr_SetString(PyExc_SystemError, "UnpackTuple() argument list is not a tuple");
     return 0;
   } else {
-    register int l = PyTuple_GET_SIZE(args);
+    register Py_ssize_t l = PyTuple_GET_SIZE(args);
     if (l < min) {
       PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
-		   name, (min == max ? "" : "at least "), min, l);
+		   name, (min == max ? "" : "at least "), (int)min, (int)l);
       return 0;
     } else if (l > max) {
       PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
-		   name, (min == max ? "" : "at most "), max, l);
+		   name, (min == max ? "" : "at most "), (int)max, (int)l);
       return 0;
     } else {
       register int i;
@@ -1591,9 +1597,11 @@
     (unaryfunc)0,                 /*nb_float*/
     (unaryfunc)PySwigObject_oct,  /*nb_oct*/
     (unaryfunc)PySwigObject_hex,  /*nb_hex*/
-#if PY_VERSION_HEX >= 0x02020000
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */ 
-#elif PY_VERSION_HEX >= 0x02000000
+#if PY_VERSION_HEX >= 0x02050000 /* 2.5.0 */
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index */
+#elif PY_VERSION_HEX >= 0x02020000 /* 2.2.0 */
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */
+#elif PY_VERSION_HEX >= 0x02000000 /* 2.0.0 */
     0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_or */
 #endif
   };
@@ -2469,7 +2477,7 @@
 
 #define SWIG_name    "_pymgmt"
 
-#define SWIGVERSION 0x010331 
+#define SWIGVERSION 0x010333 
 #define SWIG_VERSION SWIGVERSION
 
 
--- a/lib/pils/Makefile.in
+++ b/lib/pils/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,76 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = lib/pils
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(plugindir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+pluginLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES) $(plugin_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+libpils_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la \
+	$(am__DEPENDENCIES_1)
+am_libpils_la_OBJECTS = pils.lo
+libpils_la_OBJECTS = $(am_libpils_la_OBJECTS)
+libpils_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libpils_la_LDFLAGS) $(LDFLAGS) -o $@
+test_la_LIBADD =
+am_test_la_OBJECTS = test.lo
+test_la_OBJECTS = $(am_test_la_OBJECTS)
+test_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(test_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libpils_la_SOURCES) $(test_la_SOURCES)
+DIST_SOURCES = $(libpils_la_SOURCES) $(test_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +122,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +165,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +176,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +184,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +203,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +211,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +246,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +266,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +276,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +285,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +305,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +327,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +342,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # pils: Linux-HA heartbeat code
@@ -361,15 +372,12 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
 			-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha  \
 			-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
 
-
 AM_CFLAGS = @CFLAGS@
 
-
 #pkginclude_HEADERS	= $(top_srcdir)/include/pils/plugin.h \
 #			$(top_srcdir)/include/pils/interface.h
 
@@ -382,10 +390,8 @@
 #			$(top_builddir)/replace/libreplace.la
 #main_LDFLAGS		= @LIBADD_DL@ @LIBLTDL@ -export-dynamic @DLOPEN_FORCE_FLAGS@
 lib_LTLIBRARIES = libpils.la
-
 plugindir = $(pkglibdir)/plugins/test
 plugin_LTLIBRARIES = test.la 
-
 libpils_la_SOURCES = pils.c
 libpils_la_LDFLAGS = -version-info 1:0:0
 libpils_la_LIBADD = $(top_builddir)/replace/libreplace.la	\
@@ -393,108 +399,100 @@
 
 test_la_SOURCES = test.c
 test_la_LDFLAGS = -export-dynamic -module -avoid-version
-subdir = lib/pils
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(lib_LTLIBRARIES) $(plugin_LTLIBRARIES)
-
-libpils_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
-am_libpils_la_OBJECTS = pils.lo
-libpils_la_OBJECTS = $(am_libpils_la_OBJECTS)
-test_la_LIBADD =
-am_test_la_OBJECTS = test.lo
-test_la_OBJECTS = $(am_test_la_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/pils.Plo ./$(DEPDIR)/test.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libpils_la_SOURCES) $(test_la_SOURCES)
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(libpils_la_SOURCES) $(test_la_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/pils/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/pils/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-libLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-pluginLTLIBRARIES_INSTALL = $(INSTALL)
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(plugindir)
+	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-pluginLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
 	done
 
 clean-pluginLTLIBRARIES:
 	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libpils.la: $(libpils_la_OBJECTS) $(libpils_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libpils_la_LDFLAGS) $(libpils_la_OBJECTS) $(libpils_la_LIBADD) $(LIBS)
+	$(libpils_la_LINK) -rpath $(libdir) $(libpils_la_OBJECTS) $(libpils_la_LIBADD) $(LIBS)
 test.la: $(test_la_OBJECTS) $(test_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(test_la_LDFLAGS) $(test_la_OBJECTS) $(test_la_LIBADD) $(LIBS)
+	$(test_la_LINK) -rpath $(plugindir) $(test_la_OBJECTS) $(test_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -503,37 +501,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -541,18 +527,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -561,6 +535,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -572,10 +547,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -598,28 +574,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -633,9 +604,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(plugindir)
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(plugindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -655,7 +627,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -670,24 +642,34 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-pluginLTLIBRARIES
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -708,21 +690,25 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
-	uninstall-pluginLTLIBRARIES
+uninstall-am: uninstall-libLTLIBRARIES uninstall-pluginLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool clean-pluginLTLIBRARIES \
 	ctags distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pluginLTLIBRARIES \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
-	pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \
-	uninstall-libLTLIBRARIES uninstall-pluginLTLIBRARIES
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-pluginLTLIBRARIES install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-libLTLIBRARIES \
+	uninstall-pluginLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/lib/plugins/AppHBNotification/Makefile.in
+++ b/lib/plugins/AppHBNotification/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,68 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = lib/plugins/AppHBNotification
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(plugindir)"
+pluginLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(plugin_LTLIBRARIES)
+recmgr_la_DEPENDENCIES =  \
+	$(top_builddir)/lib/recoverymgr/librecoverymgr.la
+am_recmgr_la_OBJECTS = recmgr.lo
+recmgr_la_OBJECTS = $(am_recmgr_la_OBJECTS)
+recmgr_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(recmgr_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(recmgr_la_SOURCES)
+DIST_SOURCES = $(recmgr_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +114,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +157,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +168,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +176,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +195,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +203,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +238,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +258,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +268,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +277,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +297,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +319,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +334,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # RecoveryMgr: Recovery manager plugins for Linux-HA
@@ -361,90 +364,82 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
 			-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha  \
 			-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl  \
 			-I$(top_builddir)/lib/upmls -I$(top_srcdir)/lib/upmls
 
-
 halibdir = $(libdir)/@HB_PKG@
 plugindir = $(halibdir)/plugins/AppHBNotification
 plugin_LTLIBRARIES = recmgr.la
-
 recmgr_la_SOURCES = recmgr.c 
 recmgr_la_LIBADD = $(top_builddir)/lib/recoverymgr/librecoverymgr.la
 recmgr_la_LDFLAGS = -export-dynamic -module -avoid-version
-subdir = lib/plugins/AppHBNotification
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-
-recmgr_la_DEPENDENCIES = \
-	$(top_builddir)/lib/recoverymgr/librecoverymgr.la
-am_recmgr_la_OBJECTS = recmgr.lo
-recmgr_la_OBJECTS = $(am_recmgr_la_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/recmgr.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(recmgr_la_SOURCES)
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(recmgr_la_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/plugins/AppHBNotification/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/plugins/AppHBNotification/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-pluginLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(plugindir)
+	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-pluginLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
 	done
 
 clean-pluginLTLIBRARIES:
 	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 recmgr.la: $(recmgr_la_OBJECTS) $(recmgr_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(recmgr_la_LDFLAGS) $(recmgr_la_OBJECTS) $(recmgr_la_LIBADD) $(LIBS)
+	$(recmgr_la_LINK) -rpath $(plugindir) $(recmgr_la_OBJECTS) $(recmgr_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -452,37 +447,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recmgr.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -490,18 +473,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -510,6 +481,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -521,10 +493,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -547,28 +520,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -582,9 +550,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(plugindir)
+	for dir in "$(DESTDIR)$(plugindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -604,7 +573,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -619,24 +588,34 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-pluginLTLIBRARIES
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -657,20 +636,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-pluginLTLIBRARIES
+uninstall-am: uninstall-pluginLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-pluginLTLIBRARIES install-strip installcheck \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pluginLTLIBRARIES \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-pluginLTLIBRARIES
+	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/lib/plugins/HBauth/Makefile.in
+++ b/lib/plugins/HBauth/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,78 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = lib/plugins/HBauth
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(plugindir)"
+pluginLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(plugin_LTLIBRARIES)
+crc_la_LIBADD =
+am_crc_la_OBJECTS = crc.lo
+crc_la_OBJECTS = $(am_crc_la_OBJECTS)
+crc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(crc_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_md5_la_OBJECTS = md5.lo
+md5_la_OBJECTS = $(am_md5_la_OBJECTS)
+md5_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(md5_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+sha1_la_LIBADD =
+am_sha1_la_OBJECTS = sha1.lo
+sha1_la_OBJECTS = $(am_sha1_la_OBJECTS)
+sha1_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(sha1_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(crc_la_SOURCES) $(md5_la_SOURCES) $(sha1_la_SOURCES)
+DIST_SOURCES = $(crc_la_SOURCES) $(md5_la_SOURCES) $(sha1_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +124,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +167,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +178,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +186,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +205,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +213,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +248,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +268,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +278,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +287,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +307,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +329,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +344,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # InterfaceMgr: Interface manager plugins for Linux-HA
@@ -361,108 +374,92 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
 			-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha  \
 			-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl  \
 			-I$(top_builddir)/lib/upmls -I$(top_srcdir)/lib/upmls
 
-
 AM_CFLAGS = @CFLAGS@
-
 halibdir = $(libdir)/@HB_PKG@
 plugindir = $(halibdir)/plugins/HBauth
 plugin_LTLIBRARIES = md5.la crc.la sha1.la
-
 md5_la_SOURCES = md5.c
 md5_la_LDFLAGS = -export-dynamic -module -avoid-version
 md5_la_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la
 md5_la_LIBADD = $(top_builddir)/lib/clplumbing/libplumb.la
-
 crc_la_SOURCES = crc.c
 crc_la_LDFLAGS = -export-dynamic -module -avoid-version
-
 sha1_la_SOURCES = sha1.c
 sha1_la_LDFLAGS = -export-dynamic -module -avoid-version
-subdir = lib/plugins/HBauth
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-
-crc_la_LIBADD =
-am_crc_la_OBJECTS = crc.lo
-crc_la_OBJECTS = $(am_crc_la_OBJECTS)
-am_md5_la_OBJECTS = md5.lo
-md5_la_OBJECTS = $(am_md5_la_OBJECTS)
-sha1_la_LIBADD =
-am_sha1_la_OBJECTS = sha1.lo
-sha1_la_OBJECTS = $(am_sha1_la_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/crc.Plo ./$(DEPDIR)/md5.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/sha1.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(crc_la_SOURCES) $(md5_la_SOURCES) $(sha1_la_SOURCES)
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(crc_la_SOURCES) $(md5_la_SOURCES) $(sha1_la_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/plugins/HBauth/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/plugins/HBauth/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-pluginLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(plugindir)
+	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-pluginLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
 	done
 
 clean-pluginLTLIBRARIES:
 	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 crc.la: $(crc_la_OBJECTS) $(crc_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(crc_la_LDFLAGS) $(crc_la_OBJECTS) $(crc_la_LIBADD) $(LIBS)
+	$(crc_la_LINK) -rpath $(plugindir) $(crc_la_OBJECTS) $(crc_la_LIBADD) $(LIBS)
 md5.la: $(md5_la_OBJECTS) $(md5_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(md5_la_LDFLAGS) $(md5_la_OBJECTS) $(md5_la_LIBADD) $(LIBS)
+	$(md5_la_LINK) -rpath $(plugindir) $(md5_la_OBJECTS) $(md5_la_LIBADD) $(LIBS)
 sha1.la: $(sha1_la_OBJECTS) $(sha1_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(sha1_la_LDFLAGS) $(sha1_la_OBJECTS) $(sha1_la_LIBADD) $(LIBS)
+	$(sha1_la_LINK) -rpath $(plugindir) $(sha1_la_OBJECTS) $(sha1_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -472,37 +469,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -510,18 +495,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -530,6 +503,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -541,10 +515,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -567,28 +542,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -602,9 +572,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(plugindir)
+	for dir in "$(DESTDIR)$(plugindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -624,7 +595,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -639,24 +610,34 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-pluginLTLIBRARIES
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -677,20 +658,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-pluginLTLIBRARIES
+uninstall-am: uninstall-pluginLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-pluginLTLIBRARIES install-strip installcheck \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pluginLTLIBRARIES \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-pluginLTLIBRARIES
+	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/lib/plugins/HBcomm/Makefile.in
+++ b/lib/plugins/HBcomm/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,134 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = lib/plugins/HBcomm
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(plugindir)"
+pluginLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(plugin_LTLIBRARIES)
+bcast_la_LIBADD =
+am_bcast_la_OBJECTS = bcast.lo
+bcast_la_OBJECTS = $(am_bcast_la_OBJECTS)
+bcast_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(bcast_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+hbaping_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
+am_hbaping_la_OBJECTS = hbaping.lo
+hbaping_la_OBJECTS = $(am_hbaping_la_OBJECTS)
+hbaping_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(hbaping_la_LDFLAGS) $(LDFLAGS) -o $@
+@HBAAPI_BUILD_TRUE@am_hbaping_la_rpath = -rpath $(plugindir)
+mcast_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
+am_mcast_la_OBJECTS = mcast.lo
+mcast_la_OBJECTS = $(am_mcast_la_OBJECTS)
+mcast_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(mcast_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+openais_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
+am_openais_la_OBJECTS = openais.lo
+openais_la_OBJECTS = $(am_openais_la_OBJECTS)
+openais_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(openais_la_LDFLAGS) $(LDFLAGS) -o $@
+@BUILD_OPENAIS_MODULE_TRUE@am_openais_la_rpath = -rpath $(plugindir)
+ping_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
+am_ping_la_OBJECTS = ping.lo
+ping_la_OBJECTS = $(am_ping_la_OBJECTS)
+ping_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(ping_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+ping_group_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
+am_ping_group_la_OBJECTS = ping_group.lo
+ping_group_la_OBJECTS = $(am_ping_group_la_OBJECTS)
+ping_group_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(ping_group_la_LDFLAGS) $(LDFLAGS) -o $@
+serial_la_LIBADD =
+am_serial_la_OBJECTS = serial.lo
+serial_la_OBJECTS = $(am_serial_la_OBJECTS)
+serial_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(serial_la_LDFLAGS) $(LDFLAGS) -o $@
+tipc_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
+am_tipc_la_OBJECTS = tipc.lo
+tipc_la_OBJECTS = $(am_tipc_la_OBJECTS)
+tipc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(tipc_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+@BUILD_TIPC_MODULE_TRUE@am_tipc_la_rpath = -rpath $(plugindir)
+ucast_la_LIBADD =
+am_ucast_la_OBJECTS = ucast.lo
+ucast_la_OBJECTS = $(am_ucast_la_OBJECTS)
+ucast_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(ucast_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(bcast_la_SOURCES) $(hbaping_la_SOURCES) \
+	$(mcast_la_SOURCES) $(openais_la_SOURCES) $(ping_la_SOURCES) \
+	$(ping_group_la_SOURCES) $(serial_la_SOURCES) \
+	$(tipc_la_SOURCES) $(ucast_la_SOURCES)
+DIST_SOURCES = $(bcast_la_SOURCES) $(hbaping_la_SOURCES) \
+	$(mcast_la_SOURCES) $(openais_la_SOURCES) $(ping_la_SOURCES) \
+	$(ping_group_la_SOURCES) $(serial_la_SOURCES) \
+	$(tipc_la_SOURCES) $(ucast_la_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +180,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +223,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +234,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +242,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +261,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +269,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +304,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +324,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +334,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +343,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +363,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +385,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +400,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # InterfaceMgr: Interface manager plugins for Linux-HA
@@ -361,185 +430,127 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 @HBAAPI_BUILD_TRUE@HBAPING = hbaping.la
-
 @BUILD_OPENAIS_MODULE_TRUE@OPENAIS = openais.la
-
 @BUILD_TIPC_MODULE_TRUE@TIPC = tipc.la
-
 SUBDIRS = 
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include   \
 			-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha   \
 			-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl     \
 			-I$(top_builddir)/lib/upmls -I$(top_srcdir)/lib/upmls \
                         @TIPC_INCLUDE@
 
-
 AM_CFLAGS = @CFLAGS@
-
 halibdir = $(libdir)/@HB_PKG@
 plugindir = $(halibdir)/plugins/HBcomm
 plugin_LTLIBRARIES = bcast.la mcast.la ping.la serial.la ucast.la \
 			  ping_group.la  $(HBAPING) $(OPENAIS) $(TIPC)
 
-
 bcast_la_SOURCES = bcast.c
 bcast_la_LDFLAGS = -export-dynamic -module -avoid-version
-
 ucast_la_SOURCES = ucast.c
 ucast_la_LDFLAGS = -export-dynamic -module -avoid-version
-
 mcast_la_SOURCES = mcast.c
 mcast_la_LDFLAGS = -export-dynamic -module -avoid-version 
 mcast_la_LIBADD = $(top_builddir)/replace/libreplace.la
-
 serial_la_SOURCES = serial.c
 serial_la_LDFLAGS = -export-dynamic -module -avoid-version
-
 ping_la_SOURCES = ping.c
 ping_la_LDFLAGS = -export-dynamic -module -avoid-version
 ping_la_LIBADD = $(top_builddir)/replace/libreplace.la
-
 ping_group_la_SOURCES = ping_group.c
 ping_group_la_LDFLAGS = -export-dynamic -module -avoid-version
 ping_group_la_LIBADD = $(top_builddir)/replace/libreplace.la
-
 hbaping_la_SOURCES = hbaping.c
 hbaping_la_LDFLAGS = -export-dynamic -module -avoid-version
 hbaping_la_LIBADD = $(top_builddir)/replace/libreplace.la
-
 openais_la_SOURCES = openais.c
 openais_la_LDFLAGS = -export-dynamic -module -avoid-version
 openais_la_LIBADD = $(top_builddir)/replace/libreplace.la -levs
-
 tipc_la_SOURCES = tipc.c
 tipc_la_LDFLAGS = -export-dynamic -module -avoid-version
 tipc_la_LIBADD = $(top_builddir)/replace/libreplace.la
-subdir = lib/plugins/HBcomm
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-
-bcast_la_LIBADD =
-am_bcast_la_OBJECTS = bcast.lo
-bcast_la_OBJECTS = $(am_bcast_la_OBJECTS)
-hbaping_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
-am_hbaping_la_OBJECTS = hbaping.lo
-hbaping_la_OBJECTS = $(am_hbaping_la_OBJECTS)
-mcast_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
-am_mcast_la_OBJECTS = mcast.lo
-mcast_la_OBJECTS = $(am_mcast_la_OBJECTS)
-openais_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
-am_openais_la_OBJECTS = openais.lo
-openais_la_OBJECTS = $(am_openais_la_OBJECTS)
-ping_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
-am_ping_la_OBJECTS = ping.lo
-ping_la_OBJECTS = $(am_ping_la_OBJECTS)
-ping_group_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
-am_ping_group_la_OBJECTS = ping_group.lo
-ping_group_la_OBJECTS = $(am_ping_group_la_OBJECTS)
-serial_la_LIBADD =
-am_serial_la_OBJECTS = serial.lo
-serial_la_OBJECTS = $(am_serial_la_OBJECTS)
-tipc_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
-am_tipc_la_OBJECTS = tipc.lo
-tipc_la_OBJECTS = $(am_tipc_la_OBJECTS)
-ucast_la_LIBADD =
-am_ucast_la_OBJECTS = ucast.lo
-ucast_la_OBJECTS = $(am_ucast_la_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bcast.Plo ./$(DEPDIR)/hbaping.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/mcast.Plo ./$(DEPDIR)/openais.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/ping.Plo ./$(DEPDIR)/ping_group.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/serial.Plo ./$(DEPDIR)/tipc.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/ucast.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(bcast_la_SOURCES) $(hbaping_la_SOURCES) \
-	$(mcast_la_SOURCES) $(openais_la_SOURCES) $(ping_la_SOURCES) \
-	$(ping_group_la_SOURCES) $(serial_la_SOURCES) \
-	$(tipc_la_SOURCES) $(ucast_la_SOURCES)
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(bcast_la_SOURCES) $(hbaping_la_SOURCES) $(mcast_la_SOURCES) $(openais_la_SOURCES) $(ping_la_SOURCES) $(ping_group_la_SOURCES) $(serial_la_SOURCES) $(tipc_la_SOURCES) $(ucast_la_SOURCES)
-
 all: all-recursive
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/plugins/HBcomm/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/plugins/HBcomm/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-pluginLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(plugindir)
+	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-pluginLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
 	done
 
 clean-pluginLTLIBRARIES:
 	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 bcast.la: $(bcast_la_OBJECTS) $(bcast_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(bcast_la_LDFLAGS) $(bcast_la_OBJECTS) $(bcast_la_LIBADD) $(LIBS)
+	$(bcast_la_LINK) -rpath $(plugindir) $(bcast_la_OBJECTS) $(bcast_la_LIBADD) $(LIBS)
 hbaping.la: $(hbaping_la_OBJECTS) $(hbaping_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(hbaping_la_LDFLAGS) $(hbaping_la_OBJECTS) $(hbaping_la_LIBADD) $(LIBS)
+	$(hbaping_la_LINK) $(am_hbaping_la_rpath) $(hbaping_la_OBJECTS) $(hbaping_la_LIBADD) $(LIBS)
 mcast.la: $(mcast_la_OBJECTS) $(mcast_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(mcast_la_LDFLAGS) $(mcast_la_OBJECTS) $(mcast_la_LIBADD) $(LIBS)
+	$(mcast_la_LINK) -rpath $(plugindir) $(mcast_la_OBJECTS) $(mcast_la_LIBADD) $(LIBS)
 openais.la: $(openais_la_OBJECTS) $(openais_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(openais_la_LDFLAGS) $(openais_la_OBJECTS) $(openais_la_LIBADD) $(LIBS)
+	$(openais_la_LINK) $(am_openais_la_rpath) $(openais_la_OBJECTS) $(openais_la_LIBADD) $(LIBS)
 ping.la: $(ping_la_OBJECTS) $(ping_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(ping_la_LDFLAGS) $(ping_la_OBJECTS) $(ping_la_LIBADD) $(LIBS)
+	$(ping_la_LINK) -rpath $(plugindir) $(ping_la_OBJECTS) $(ping_la_LIBADD) $(LIBS)
 ping_group.la: $(ping_group_la_OBJECTS) $(ping_group_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(ping_group_la_LDFLAGS) $(ping_group_la_OBJECTS) $(ping_group_la_LIBADD) $(LIBS)
+	$(ping_group_la_LINK) -rpath $(plugindir) $(ping_group_la_OBJECTS) $(ping_group_la_LIBADD) $(LIBS)
 serial.la: $(serial_la_OBJECTS) $(serial_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(serial_la_LDFLAGS) $(serial_la_OBJECTS) $(serial_la_LIBADD) $(LIBS)
+	$(serial_la_LINK) -rpath $(plugindir) $(serial_la_OBJECTS) $(serial_la_LIBADD) $(LIBS)
 tipc.la: $(tipc_la_OBJECTS) $(tipc_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(tipc_la_LDFLAGS) $(tipc_la_OBJECTS) $(tipc_la_LIBADD) $(LIBS)
+	$(tipc_la_LINK) $(am_tipc_la_rpath) $(tipc_la_OBJECTS) $(tipc_la_LIBADD) $(LIBS)
 ucast.la: $(ucast_la_OBJECTS) $(ucast_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(ucast_la_LDFLAGS) $(ucast_la_OBJECTS) $(ucast_la_LIBADD) $(LIBS)
+	$(ucast_la_LINK) -rpath $(plugindir) $(ucast_la_OBJECTS) $(ucast_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -555,37 +566,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ucast.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -593,10 +592,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -604,7 +599,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -616,15 +617,20 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -645,7 +651,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -656,14 +662,6 @@
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -672,19 +670,22 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -694,10 +695,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -720,28 +722,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -752,15 +749,19 @@
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -770,8 +771,9 @@
 all-am: Makefile $(LTLIBRARIES)
 installdirs: installdirs-recursive
 installdirs-am:
-	$(mkinstalldirs) $(DESTDIR)$(plugindir)
-
+	for dir in "$(DESTDIR)$(plugindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -791,7 +793,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -806,24 +808,34 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
+html: html-recursive
+
 info: info-recursive
 
 info-am:
 
 install-data-am: install-pluginLTLIBRARIES
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -844,28 +856,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-pluginLTLIBRARIES
+uninstall-am: uninstall-pluginLTLIBRARIES
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	clean-recursive ctags ctags-recursive distclean \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	clean-pluginLTLIBRARIES ctags ctags-recursive distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
-	install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
-	install-pluginLTLIBRARIES install-recursive install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	installdirs-recursive maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
-	tags-recursive uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-pluginLTLIBRARIES \
-	uninstall-recursive
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pluginLTLIBRARIES \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
+	uninstall-pluginLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/lib/plugins/HBcompress/Makefile.in
+++ b/lib/plugins/HBcompress/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,86 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = lib/plugins/HBcompress
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(plugindir)"
+pluginLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(plugin_LTLIBRARIES)
+bz2_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
+am_bz2_la_OBJECTS = bz2.lo
+bz2_la_OBJECTS = $(am_bz2_la_OBJECTS)
+bz2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(bz2_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+@BUILD_BZ2_COMPRESS_MODULE_TRUE@am_bz2_la_rpath = -rpath $(plugindir)
+zlib_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
+am_zlib_la_OBJECTS = zlib.lo
+zlib_la_OBJECTS = $(am_zlib_la_OBJECTS)
+zlib_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(zlib_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+@BUILD_ZLIB_COMPRESS_MODULE_TRUE@am_zlib_la_rpath = -rpath \
+@BUILD_ZLIB_COMPRESS_MODULE_TRUE@	$(plugindir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(bz2_la_SOURCES) $(zlib_la_SOURCES)
+DIST_SOURCES = $(bz2_la_SOURCES) $(zlib_la_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +132,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +175,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +186,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +194,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +213,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +221,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +256,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +276,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +286,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +295,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +315,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +337,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +352,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # InterfaceMgr: Interface manager plugins for Linux-HA
@@ -361,113 +382,91 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 @BUILD_ZLIB_COMPRESS_MODULE_TRUE@zlibmodule = zlib.la
-
 @BUILD_BZ2_COMPRESS_MODULE_TRUE@bz2module = bz2.la
-
 SUBDIRS = 
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
 			-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha  \
 			-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl  \
 			-I$(top_builddir)/lib/upmls -I$(top_srcdir)/lib/upmls
 
-
 AM_CFLAGS = @CFLAGS@
-
 halibdir = $(libdir)/@HB_PKG@
 plugindir = $(halibdir)/plugins/HBcompress
 plugin_LTLIBRARIES = $(zlibmodule) $(bz2module)
-
 zlib_la_SOURCES = zlib.c
 zlib_la_LDFLAGS = -export-dynamic -module -avoid-version -lz
 zlib_la_LIBADD = $(top_builddir)/replace/libreplace.la 
-
 bz2_la_SOURCES = bz2.c
 bz2_la_LDFLAGS = -export-dynamic -module -avoid-version -lbz2
 bz2_la_LIBADD = $(top_builddir)/replace/libreplace.la
-subdir = lib/plugins/HBcompress
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-
-bz2_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
-am_bz2_la_OBJECTS = bz2.lo
-bz2_la_OBJECTS = $(am_bz2_la_OBJECTS)
-zlib_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
-am_zlib_la_OBJECTS = zlib.lo
-zlib_la_OBJECTS = $(am_zlib_la_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bz2.Plo ./$(DEPDIR)/zlib.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(bz2_la_SOURCES) $(zlib_la_SOURCES)
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(bz2_la_SOURCES) $(zlib_la_SOURCES)
-
 all: all-recursive
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/plugins/HBcompress/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/plugins/HBcompress/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-pluginLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(plugindir)
+	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-pluginLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
 	done
 
 clean-pluginLTLIBRARIES:
 	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 bz2.la: $(bz2_la_OBJECTS) $(bz2_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(bz2_la_LDFLAGS) $(bz2_la_OBJECTS) $(bz2_la_LIBADD) $(LIBS)
+	$(bz2_la_LINK) $(am_bz2_la_rpath) $(bz2_la_OBJECTS) $(bz2_la_LIBADD) $(LIBS)
 zlib.la: $(zlib_la_OBJECTS) $(zlib_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(zlib_la_LDFLAGS) $(zlib_la_OBJECTS) $(zlib_la_LIBADD) $(LIBS)
+	$(zlib_la_LINK) $(am_zlib_la_rpath) $(zlib_la_OBJECTS) $(zlib_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -476,37 +475,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zlib.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -514,10 +501,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -525,7 +508,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -537,15 +526,20 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -566,7 +560,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -577,14 +571,6 @@
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -593,19 +579,22 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -615,10 +604,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -641,28 +631,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -673,15 +658,19 @@
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -691,8 +680,9 @@
 all-am: Makefile $(LTLIBRARIES)
 installdirs: installdirs-recursive
 installdirs-am:
-	$(mkinstalldirs) $(DESTDIR)$(plugindir)
-
+	for dir in "$(DESTDIR)$(plugindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -712,7 +702,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -727,24 +717,34 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
+html: html-recursive
+
 info: info-recursive
 
 info-am:
 
 install-data-am: install-pluginLTLIBRARIES
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -765,28 +765,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-pluginLTLIBRARIES
+uninstall-am: uninstall-pluginLTLIBRARIES
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	clean-recursive ctags ctags-recursive distclean \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	clean-pluginLTLIBRARIES ctags ctags-recursive distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
-	install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
-	install-pluginLTLIBRARIES install-recursive install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	installdirs-recursive maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
-	tags-recursive uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-pluginLTLIBRARIES \
-	uninstall-recursive
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pluginLTLIBRARIES \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
+	uninstall-pluginLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/lib/plugins/InterfaceMgr/Makefile.in
+++ b/lib/plugins/InterfaceMgr/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,67 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = lib/plugins/InterfaceMgr
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(plugindir)"
+pluginLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(plugin_LTLIBRARIES)
+generic_la_LIBADD =
+am_generic_la_OBJECTS = generic.lo
+generic_la_OBJECTS = $(am_generic_la_OBJECTS)
+generic_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(generic_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(generic_la_SOURCES)
+DIST_SOURCES = $(generic_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +113,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +156,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +167,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +175,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +194,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +202,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +237,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +257,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +267,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +276,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +296,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +318,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +333,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # InterfaceMgr: Interface manager plugins for Linux-HA
@@ -361,89 +363,81 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
 			-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha  \
 			-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl  \
 			-I$(top_builddir)/lib/upmls -I$(top_srcdir)/lib/upmls
 
-
 AM_CFLAGS = @CFLAGS@
-
 plugindir = $(pils_plugindir)/InterfaceMgr
 plugin_LTLIBRARIES = generic.la
-
 generic_la_SOURCES = generic.c
 generic_la_LDFLAGS = -export-dynamic -module -avoid-version
-subdir = lib/plugins/InterfaceMgr
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-
-generic_la_LIBADD =
-am_generic_la_OBJECTS = generic.lo
-generic_la_OBJECTS = $(am_generic_la_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/generic.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(generic_la_SOURCES)
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(generic_la_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/plugins/InterfaceMgr/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/plugins/InterfaceMgr/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-pluginLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(plugindir)
+	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-pluginLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
 	done
 
 clean-pluginLTLIBRARIES:
 	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 generic.la: $(generic_la_OBJECTS) $(generic_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(generic_la_LDFLAGS) $(generic_la_OBJECTS) $(generic_la_LIBADD) $(LIBS)
+	$(generic_la_LINK) -rpath $(plugindir) $(generic_la_OBJECTS) $(generic_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -451,37 +445,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/generic.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -489,18 +471,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -509,6 +479,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -520,10 +491,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -546,28 +518,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -581,9 +548,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(plugindir)
+	for dir in "$(DESTDIR)$(plugindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -603,7 +571,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -618,24 +586,34 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-pluginLTLIBRARIES
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -656,20 +634,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-pluginLTLIBRARIES
+uninstall-am: uninstall-pluginLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-pluginLTLIBRARIES install-strip installcheck \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pluginLTLIBRARIES \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-pluginLTLIBRARIES
+	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/lib/plugins/Makefile.in
+++ b/lib/plugins/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -33,17 +33,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -55,39 +49,51 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = lib/plugins
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = InterfaceMgr HBauth HBcomm HBcompress stonith \
+	AppHBNotification lrm quorum tiebreaker quorumd
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -110,8 +116,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -155,8 +159,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -168,6 +170,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -175,12 +178,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -198,8 +197,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -208,15 +205,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -246,8 +240,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -268,8 +260,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -280,20 +270,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -301,17 +279,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -319,6 +299,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -340,6 +321,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -354,46 +336,53 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 MAINTAINERCLEANFILES = Makefile.in
-
 @LRM_BUILD_TRUE@LRM_DIR = lrm
-
 @QUORUMD_BUILD_TRUE@QUORUMD_DIR = quorumd
-
 SUBDIRS = InterfaceMgr HBauth HBcomm HBcompress stonith AppHBNotification \
 			  $(LRM_DIR)  quorum  tiebreaker $(QUORUMD_DIR)
 
-subdir = lib/plugins
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-DIST_SUBDIRS = InterfaceMgr HBauth HBcomm HBcompress stonith \
-	AppHBNotification lrm quorum tiebreaker quorumd
 all: all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/plugins/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/plugins/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -401,10 +390,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -412,7 +397,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -424,15 +415,20 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -453,7 +449,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -464,14 +460,6 @@
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -480,19 +468,22 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -502,10 +493,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -528,28 +520,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -562,13 +549,17 @@
 	done
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -578,7 +569,6 @@
 all-am: Makefile
 installdirs: installdirs-recursive
 installdirs-am:
-
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -598,7 +588,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -610,25 +600,34 @@
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
+html: html-recursive
+
 info: info-recursive
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -647,26 +646,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
-	install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
-	install-recursive install-strip installcheck installcheck-am \
-	installdirs installdirs-am installdirs-recursive \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-recursive
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/lib/plugins/lrm/Makefile.in
+++ b/lib/plugins/lrm/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,87 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = lib/plugins/lrm
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(plugindir)"
+pluginLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(plugin_LTLIBRARIES)
+heartbeat_la_LIBADD =
+am_heartbeat_la_OBJECTS = raexechb.lo racommon.lo
+heartbeat_la_OBJECTS = $(am_heartbeat_la_OBJECTS)
+heartbeat_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(heartbeat_la_LDFLAGS) $(LDFLAGS) -o $@
+lsb_la_LIBADD =
+am_lsb_la_OBJECTS = raexeclsb.lo racommon.lo
+lsb_la_OBJECTS = $(am_lsb_la_OBJECTS)
+lsb_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(lsb_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+ocf_la_LIBADD =
+am_ocf_la_OBJECTS = raexecocf.lo racommon.lo
+ocf_la_OBJECTS = $(am_ocf_la_OBJECTS)
+ocf_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(ocf_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+stonith_la_LIBADD =
+am_stonith_la_OBJECTS = raexecstonith.lo racommon.lo
+stonith_la_OBJECTS = $(am_stonith_la_OBJECTS)
+stonith_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(stonith_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(heartbeat_la_SOURCES) $(lsb_la_SOURCES) $(ocf_la_SOURCES) \
+	$(stonith_la_SOURCES)
+DIST_SOURCES = $(heartbeat_la_SOURCES) $(lsb_la_SOURCES) \
+	$(ocf_la_SOURCES) $(stonith_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +133,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +176,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +187,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +195,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +214,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +222,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +257,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +277,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +287,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +296,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +316,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +338,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +353,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # Author: Sun Jiang Dong <sunjd@cn.ibm.com>
@@ -365,120 +387,97 @@
 					-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
 					-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
 
-
 halibdir = $(libdir)/@HB_PKG@
 havarlibdir = $(localstatedir)/lib/@HB_PKG@
 COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la   \
                         		$(GLIBLIB)
 
-
 lrmdir = $(HA_VARLIBDIR)/$(HB_PKG)/$(LRM_DIR)
 plugindir = $(halibdir)/plugins/RAExec
 apigid = @HA_APIGID@
-
 plugin_LTLIBRARIES = lsb.la ocf.la heartbeat.la stonith.la
 lsb_la_SOURCES = raexeclsb.c racommon.c
 lsb_la_LDFLAGS = -L$(top_builddir)/lib/pils -lpils -export-dynamic -module -avoid-version
-
 ocf_la_SOURCES = raexecocf.c racommon.c
 ocf_la_LDFLAGS = -L$(top_builddir)/lib/pils -lpils -export-dynamic -module -avoid-version
-
 stonith_la_SOURCES = raexecstonith.c racommon.c
 stonith_la_LDFLAGS = -L$(top_builddir)/lib/pils -lpils -export-dynamic -module -avoid-version \
 		     -L$(top_builddir)/lib/fencing -lstonithd \
 		     -L$(top_builddir)/lib/stonith -lstonith
 
-
 heartbeat_la_SOURCES = raexechb.c racommon.c
 heartbeat_la_LDFLAGS = -L$(top_builddir)/lib/pils -lpils -export-dynamic -module -avoid-version
-subdir = lib/plugins/lrm
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-
-heartbeat_la_LIBADD =
-am_heartbeat_la_OBJECTS = raexechb.lo racommon.lo
-heartbeat_la_OBJECTS = $(am_heartbeat_la_OBJECTS)
-lsb_la_LIBADD =
-am_lsb_la_OBJECTS = raexeclsb.lo racommon.lo
-lsb_la_OBJECTS = $(am_lsb_la_OBJECTS)
-ocf_la_LIBADD =
-am_ocf_la_OBJECTS = raexecocf.lo racommon.lo
-ocf_la_OBJECTS = $(am_ocf_la_OBJECTS)
-stonith_la_LIBADD =
-am_stonith_la_OBJECTS = raexecstonith.lo racommon.lo
-stonith_la_OBJECTS = $(am_stonith_la_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/racommon.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/raexechb.Plo ./$(DEPDIR)/raexeclsb.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/raexecocf.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/raexecstonith.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(heartbeat_la_SOURCES) $(lsb_la_SOURCES) \
-	$(ocf_la_SOURCES) $(stonith_la_SOURCES)
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(heartbeat_la_SOURCES) $(lsb_la_SOURCES) $(ocf_la_SOURCES) $(stonith_la_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/plugins/lrm/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/plugins/lrm/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-pluginLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(plugindir)
+	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-pluginLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
 	done
 
 clean-pluginLTLIBRARIES:
 	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 heartbeat.la: $(heartbeat_la_OBJECTS) $(heartbeat_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(heartbeat_la_LDFLAGS) $(heartbeat_la_OBJECTS) $(heartbeat_la_LIBADD) $(LIBS)
+	$(heartbeat_la_LINK) -rpath $(plugindir) $(heartbeat_la_OBJECTS) $(heartbeat_la_LIBADD) $(LIBS)
 lsb.la: $(lsb_la_OBJECTS) $(lsb_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(lsb_la_LDFLAGS) $(lsb_la_OBJECTS) $(lsb_la_LIBADD) $(LIBS)
+	$(lsb_la_LINK) -rpath $(plugindir) $(lsb_la_OBJECTS) $(lsb_la_LIBADD) $(LIBS)
 ocf.la: $(ocf_la_OBJECTS) $(ocf_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(ocf_la_LDFLAGS) $(ocf_la_OBJECTS) $(ocf_la_LIBADD) $(LIBS)
+	$(ocf_la_LINK) -rpath $(plugindir) $(ocf_la_OBJECTS) $(ocf_la_LIBADD) $(LIBS)
 stonith.la: $(stonith_la_OBJECTS) $(stonith_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(stonith_la_LDFLAGS) $(stonith_la_OBJECTS) $(stonith_la_LIBADD) $(LIBS)
+	$(stonith_la_LINK) -rpath $(plugindir) $(stonith_la_OBJECTS) $(stonith_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -490,37 +489,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/raexecstonith.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -528,18 +515,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -548,6 +523,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -559,10 +535,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -585,28 +562,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -620,9 +592,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(plugindir)
+	for dir in "$(DESTDIR)$(plugindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -642,7 +615,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -657,24 +630,34 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-pluginLTLIBRARIES
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-exec-local
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -695,19 +678,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-pluginLTLIBRARIES
+uninstall-am: uninstall-pluginLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-exec-local install-info install-info-am \
-	install-man install-pluginLTLIBRARIES install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-exec-local \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am \
+	install-pluginLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
 	uninstall-pluginLTLIBRARIES
 
 
--- a/lib/plugins/quorum/Makefile.in
+++ b/lib/plugins/quorum/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,104 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = lib/plugins/quorum
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(plugindir)"
+pluginLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(plugin_LTLIBRARIES)
+majority_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
+am_majority_la_OBJECTS = majority.lo
+majority_la_OBJECTS = $(am_majority_la_OBJECTS)
+majority_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(majority_la_LDFLAGS) $(LDFLAGS) -o $@
+am__DEPENDENCIES_1 =
+am__DEPENDENCIES_2 = $(top_builddir)/lib/clplumbing/libplumb.la \
+	$(am__DEPENDENCIES_1)
+@QUORUMD_BUILD_TRUE@quorumd_la_DEPENDENCIES =  \
+@QUORUMD_BUILD_TRUE@	$(top_builddir)/replace/libreplace.la \
+@QUORUMD_BUILD_TRUE@	$(am__DEPENDENCIES_2)
+am__quorumd_la_SOURCES_DIST = quorumd.c
+@QUORUMD_BUILD_TRUE@am_quorumd_la_OBJECTS = quorumd_la-quorumd.lo
+quorumd_la_OBJECTS = $(am_quorumd_la_OBJECTS)
+quorumd_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(quorumd_la_CFLAGS) \
+	$(CFLAGS) $(quorumd_la_LDFLAGS) $(LDFLAGS) -o $@
+@QUORUMD_BUILD_TRUE@am_quorumd_la_rpath = -rpath $(plugindir)
+twonodes_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
+am_twonodes_la_OBJECTS = twonodes.lo
+twonodes_la_OBJECTS = $(am_twonodes_la_OBJECTS)
+twonodes_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(twonodes_la_LDFLAGS) $(LDFLAGS) -o $@
+weight_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
+am_weight_la_OBJECTS = weight.lo
+weight_la_OBJECTS = $(am_weight_la_OBJECTS)
+weight_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(weight_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(majority_la_SOURCES) $(quorumd_la_SOURCES) \
+	$(twonodes_la_SOURCES) $(weight_la_SOURCES)
+DIST_SOURCES = $(majority_la_SOURCES) $(am__quorumd_la_SOURCES_DIST) \
+	$(twonodes_la_SOURCES) $(weight_la_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +150,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +193,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +204,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +212,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +231,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +239,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +274,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +294,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +304,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +313,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +333,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +355,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +370,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # InterfaceMgr: Interface manager plugins for Linux-HA
@@ -361,9 +400,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 SUBDIRS = 
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
 			-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha  \
 			-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl  \
@@ -372,129 +409,95 @@
 COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la   \
 			$(GLIBLIB)
 
-
 AM_CFLAGS = @CFLAGS@
-
 @QUORUMD_BUILD_TRUE@QUORUMD_PLUGIN = quorumd.la
-
 halibdir = $(libdir)/@HB_PKG@
 plugindir = $(halibdir)/plugins/quorum
 plugin_LTLIBRARIES = majority.la twonodes.la weight.la $(QUORUMD_PLUGIN)
-
 majority_la_SOURCES = majority.c
 majority_la_LDFLAGS = -export-dynamic -module -avoid-version -lz
 majority_la_LIBADD = $(top_builddir)/replace/libreplace.la 
-
 twonodes_la_SOURCES = twonodes.c
 twonodes_la_LDFLAGS = -export-dynamic -module -avoid-version -lz
 twonodes_la_LIBADD = $(top_builddir)/replace/libreplace.la 
-
 weight_la_SOURCES = weight.c
 weight_la_LDFLAGS = -export-dynamic -module -avoid-version -lz
 weight_la_LIBADD = $(top_builddir)/replace/libreplace.la 
-
 @QUORUMD_BUILD_TRUE@quorumd_la_SOURCES = quorumd.c
 @QUORUMD_BUILD_TRUE@quorumd_la_LDFLAGS = -export-dynamic -module -avoid-version -lz $(GNUTLSLIBS)
 @QUORUMD_BUILD_TRUE@quorumd_la_LIBADD = $(top_builddir)/replace/libreplace.la $(COMMONLIBS)
 @QUORUMD_BUILD_TRUE@quorumd_la_CFLAGS = $(INCLUDES) $(GNUTLSHEAD)
-subdir = lib/plugins/quorum
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-
-majority_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
-am_majority_la_OBJECTS = majority.lo
-majority_la_OBJECTS = $(am_majority_la_OBJECTS)
-@QUORUMD_BUILD_TRUE@quorumd_la_DEPENDENCIES = \
-@QUORUMD_BUILD_TRUE@	$(top_builddir)/replace/libreplace.la \
-@QUORUMD_BUILD_TRUE@	$(top_builddir)/lib/clplumbing/libplumb.la
-@QUORUMD_BUILD_FALSE@quorumd_la_DEPENDENCIES =
-am__quorumd_la_SOURCES_DIST = quorumd.c
-@QUORUMD_BUILD_TRUE@am_quorumd_la_OBJECTS = quorumd_la-quorumd.lo
-quorumd_la_OBJECTS = $(am_quorumd_la_OBJECTS)
-twonodes_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
-am_twonodes_la_OBJECTS = twonodes.lo
-twonodes_la_OBJECTS = $(am_twonodes_la_OBJECTS)
-weight_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
-am_weight_la_OBJECTS = weight.lo
-weight_la_OBJECTS = $(am_weight_la_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/majority.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/quorumd_la-quorumd.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/twonodes.Plo ./$(DEPDIR)/weight.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(majority_la_SOURCES) $(am__quorumd_la_SOURCES_DIST) \
-	$(twonodes_la_SOURCES) $(weight_la_SOURCES)
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(majority_la_SOURCES) $(quorumd_la_SOURCES) $(twonodes_la_SOURCES) $(weight_la_SOURCES)
-
 all: all-recursive
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/plugins/quorum/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/plugins/quorum/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-pluginLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(plugindir)
+	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-pluginLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
 	done
 
 clean-pluginLTLIBRARIES:
 	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 majority.la: $(majority_la_OBJECTS) $(majority_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(majority_la_LDFLAGS) $(majority_la_OBJECTS) $(majority_la_LIBADD) $(LIBS)
+	$(majority_la_LINK) -rpath $(plugindir) $(majority_la_OBJECTS) $(majority_la_LIBADD) $(LIBS)
 quorumd.la: $(quorumd_la_OBJECTS) $(quorumd_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(quorumd_la_LDFLAGS) $(quorumd_la_OBJECTS) $(quorumd_la_LIBADD) $(LIBS)
+	$(quorumd_la_LINK) $(am_quorumd_la_rpath) $(quorumd_la_OBJECTS) $(quorumd_la_LIBADD) $(LIBS)
 twonodes.la: $(twonodes_la_OBJECTS) $(twonodes_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(twonodes_la_LDFLAGS) $(twonodes_la_OBJECTS) $(twonodes_la_LIBADD) $(LIBS)
+	$(twonodes_la_LINK) -rpath $(plugindir) $(twonodes_la_OBJECTS) $(twonodes_la_LIBADD) $(LIBS)
 weight.la: $(weight_la_OBJECTS) $(weight_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(weight_la_LDFLAGS) $(weight_la_OBJECTS) $(weight_la_LIBADD) $(LIBS)
+	$(weight_la_LINK) -rpath $(plugindir) $(weight_la_OBJECTS) $(weight_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -505,70 +508,32 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weight.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-quorumd_la-quorumd.o: quorumd.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(quorumd_la_CFLAGS) $(CFLAGS) -MT quorumd_la-quorumd.o -MD -MP -MF "$(DEPDIR)/quorumd_la-quorumd.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o quorumd_la-quorumd.o `test -f 'quorumd.c' || echo '$(srcdir)/'`quorumd.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/quorumd_la-quorumd.Tpo" "$(DEPDIR)/quorumd_la-quorumd.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/quorumd_la-quorumd.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='quorumd.c' object='quorumd_la-quorumd.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/quorumd_la-quorumd.Po' tmpdepfile='$(DEPDIR)/quorumd_la-quorumd.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(quorumd_la_CFLAGS) $(CFLAGS) -c -o quorumd_la-quorumd.o `test -f 'quorumd.c' || echo '$(srcdir)/'`quorumd.c
-
-quorumd_la-quorumd.obj: quorumd.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(quorumd_la_CFLAGS) $(CFLAGS) -MT quorumd_la-quorumd.obj -MD -MP -MF "$(DEPDIR)/quorumd_la-quorumd.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o quorumd_la-quorumd.obj `if test -f 'quorumd.c'; then $(CYGPATH_W) 'quorumd.c'; else $(CYGPATH_W) '$(srcdir)/quorumd.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/quorumd_la-quorumd.Tpo" "$(DEPDIR)/quorumd_la-quorumd.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/quorumd_la-quorumd.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='quorumd.c' object='quorumd_la-quorumd.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/quorumd_la-quorumd.Po' tmpdepfile='$(DEPDIR)/quorumd_la-quorumd.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(quorumd_la_CFLAGS) $(CFLAGS) -c -o quorumd_la-quorumd.obj `if test -f 'quorumd.c'; then $(CYGPATH_W) 'quorumd.c'; else $(CYGPATH_W) '$(srcdir)/quorumd.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 quorumd_la-quorumd.lo: quorumd.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(quorumd_la_CFLAGS) $(CFLAGS) -MT quorumd_la-quorumd.lo -MD -MP -MF "$(DEPDIR)/quorumd_la-quorumd.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o quorumd_la-quorumd.lo `test -f 'quorumd.c' || echo '$(srcdir)/'`quorumd.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/quorumd_la-quorumd.Tpo" "$(DEPDIR)/quorumd_la-quorumd.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/quorumd_la-quorumd.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(quorumd_la_CFLAGS) $(CFLAGS) -MT quorumd_la-quorumd.lo -MD -MP -MF $(DEPDIR)/quorumd_la-quorumd.Tpo -c -o quorumd_la-quorumd.lo `test -f 'quorumd.c' || echo '$(srcdir)/'`quorumd.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/quorumd_la-quorumd.Tpo $(DEPDIR)/quorumd_la-quorumd.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='quorumd.c' object='quorumd_la-quorumd.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/quorumd_la-quorumd.Plo' tmpdepfile='$(DEPDIR)/quorumd_la-quorumd.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(quorumd_la_CFLAGS) $(CFLAGS) -c -o quorumd_la-quorumd.lo `test -f 'quorumd.c' || echo '$(srcdir)/'`quorumd.c
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(quorumd_la_CFLAGS) $(CFLAGS) -c -o quorumd_la-quorumd.lo `test -f 'quorumd.c' || echo '$(srcdir)/'`quorumd.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -576,10 +541,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -587,7 +548,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -599,15 +566,20 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -628,7 +600,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -639,14 +611,6 @@
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -655,19 +619,22 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -677,10 +644,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -703,28 +671,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -735,15 +698,19 @@
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -753,8 +720,9 @@
 all-am: Makefile $(LTLIBRARIES)
 installdirs: installdirs-recursive
 installdirs-am:
-	$(mkinstalldirs) $(DESTDIR)$(plugindir)
-
+	for dir in "$(DESTDIR)$(plugindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -774,7 +742,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -789,24 +757,34 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
+html: html-recursive
+
 info: info-recursive
 
 info-am:
 
 install-data-am: install-pluginLTLIBRARIES
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -827,28 +805,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-pluginLTLIBRARIES
+uninstall-am: uninstall-pluginLTLIBRARIES
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	clean-recursive ctags ctags-recursive distclean \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	clean-pluginLTLIBRARIES ctags ctags-recursive distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
-	install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
-	install-pluginLTLIBRARIES install-recursive install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	installdirs-recursive maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
-	tags-recursive uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-pluginLTLIBRARIES \
-	uninstall-recursive
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pluginLTLIBRARIES \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
+	uninstall-pluginLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/lib/plugins/quorumd/Makefile.in
+++ b/lib/plugins/quorumd/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,77 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = lib/plugins/quorumd
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(plugindir)"
+pluginLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(plugin_LTLIBRARIES)
+2_0_8_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
+am_2_0_8_la_OBJECTS = 2_0_8_la-2_0_8.lo
+2_0_8_la_OBJECTS = $(am_2_0_8_la_OBJECTS)
+2_0_8_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(2_0_8_la_CFLAGS) $(CFLAGS) \
+	$(2_0_8_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(2_0_8_la_SOURCES)
+DIST_SOURCES = $(2_0_8_la_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +123,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +166,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +177,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +185,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +204,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +212,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +247,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +267,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +277,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +286,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +306,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +328,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +343,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # InterfaceMgr: Interface manager plugins for Linux-HA
@@ -361,101 +373,85 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 SUBDIRS = 
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
 			-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha  \
 			-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl  \
 			-I$(top_builddir)/lib/upmls -I$(top_srcdir)/lib/upmls
 
-
 AM_CFLAGS = @CFLAGS@
-
 halibdir = $(libdir)/@HB_PKG@
 plugindir = $(halibdir)/plugins/quorumd
 plugin_LTLIBRARIES = 2_0_8.la
-
 2_0_8_la_SOURCES = 2_0_8.c
 2_0_8_la_LDFLAGS = -export-dynamic -module -avoid-version -lz $(GNUTLSLIBS)
 2_0_8_la_LIBADD = $(top_builddir)/replace/libreplace.la 
 2_0_8_la_CFLAGS = $(INCLUDES) $(GNUTLSHEAD)
-subdir = lib/plugins/quorumd
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-
-2_0_8_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
-am_2_0_8_la_OBJECTS = 2_0_8_la-2_0_8.lo
-2_0_8_la_OBJECTS = $(am_2_0_8_la_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/2_0_8_la-2_0_8.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(2_0_8_la_SOURCES)
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(2_0_8_la_SOURCES)
-
 all: all-recursive
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/plugins/quorumd/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/plugins/quorumd/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-pluginLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(plugindir)
+	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-pluginLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
 	done
 
 clean-pluginLTLIBRARIES:
 	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 2_0_8.la: $(2_0_8_la_OBJECTS) $(2_0_8_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(2_0_8_la_LDFLAGS) $(2_0_8_la_OBJECTS) $(2_0_8_la_LIBADD) $(LIBS)
+	$(2_0_8_la_LINK) -rpath $(plugindir) $(2_0_8_la_OBJECTS) $(2_0_8_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -463,70 +459,32 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/2_0_8_la-2_0_8.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-2_0_8_la-2_0_8.o: 2_0_8.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(2_0_8_la_CFLAGS) $(CFLAGS) -MT 2_0_8_la-2_0_8.o -MD -MP -MF "$(DEPDIR)/2_0_8_la-2_0_8.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o 2_0_8_la-2_0_8.o `test -f '2_0_8.c' || echo '$(srcdir)/'`2_0_8.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/2_0_8_la-2_0_8.Tpo" "$(DEPDIR)/2_0_8_la-2_0_8.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/2_0_8_la-2_0_8.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='2_0_8.c' object='2_0_8_la-2_0_8.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/2_0_8_la-2_0_8.Po' tmpdepfile='$(DEPDIR)/2_0_8_la-2_0_8.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(2_0_8_la_CFLAGS) $(CFLAGS) -c -o 2_0_8_la-2_0_8.o `test -f '2_0_8.c' || echo '$(srcdir)/'`2_0_8.c
-
-2_0_8_la-2_0_8.obj: 2_0_8.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(2_0_8_la_CFLAGS) $(CFLAGS) -MT 2_0_8_la-2_0_8.obj -MD -MP -MF "$(DEPDIR)/2_0_8_la-2_0_8.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o 2_0_8_la-2_0_8.obj `if test -f '2_0_8.c'; then $(CYGPATH_W) '2_0_8.c'; else $(CYGPATH_W) '$(srcdir)/2_0_8.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/2_0_8_la-2_0_8.Tpo" "$(DEPDIR)/2_0_8_la-2_0_8.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/2_0_8_la-2_0_8.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='2_0_8.c' object='2_0_8_la-2_0_8.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/2_0_8_la-2_0_8.Po' tmpdepfile='$(DEPDIR)/2_0_8_la-2_0_8.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(2_0_8_la_CFLAGS) $(CFLAGS) -c -o 2_0_8_la-2_0_8.obj `if test -f '2_0_8.c'; then $(CYGPATH_W) '2_0_8.c'; else $(CYGPATH_W) '$(srcdir)/2_0_8.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 2_0_8_la-2_0_8.lo: 2_0_8.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(2_0_8_la_CFLAGS) $(CFLAGS) -MT 2_0_8_la-2_0_8.lo -MD -MP -MF "$(DEPDIR)/2_0_8_la-2_0_8.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o 2_0_8_la-2_0_8.lo `test -f '2_0_8.c' || echo '$(srcdir)/'`2_0_8.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/2_0_8_la-2_0_8.Tpo" "$(DEPDIR)/2_0_8_la-2_0_8.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/2_0_8_la-2_0_8.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(2_0_8_la_CFLAGS) $(CFLAGS) -MT 2_0_8_la-2_0_8.lo -MD -MP -MF $(DEPDIR)/2_0_8_la-2_0_8.Tpo -c -o 2_0_8_la-2_0_8.lo `test -f '2_0_8.c' || echo '$(srcdir)/'`2_0_8.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/2_0_8_la-2_0_8.Tpo $(DEPDIR)/2_0_8_la-2_0_8.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='2_0_8.c' object='2_0_8_la-2_0_8.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/2_0_8_la-2_0_8.Plo' tmpdepfile='$(DEPDIR)/2_0_8_la-2_0_8.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(2_0_8_la_CFLAGS) $(CFLAGS) -c -o 2_0_8_la-2_0_8.lo `test -f '2_0_8.c' || echo '$(srcdir)/'`2_0_8.c
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(2_0_8_la_CFLAGS) $(CFLAGS) -c -o 2_0_8_la-2_0_8.lo `test -f '2_0_8.c' || echo '$(srcdir)/'`2_0_8.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -534,10 +492,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -545,7 +499,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -557,15 +517,20 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -586,7 +551,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -597,14 +562,6 @@
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -613,19 +570,22 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -635,10 +595,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -661,28 +622,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -693,15 +649,19 @@
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -711,8 +671,9 @@
 all-am: Makefile $(LTLIBRARIES)
 installdirs: installdirs-recursive
 installdirs-am:
-	$(mkinstalldirs) $(DESTDIR)$(plugindir)
-
+	for dir in "$(DESTDIR)$(plugindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -732,7 +693,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -747,24 +708,34 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
+html: html-recursive
+
 info: info-recursive
 
 info-am:
 
 install-data-am: install-pluginLTLIBRARIES
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -785,28 +756,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-pluginLTLIBRARIES
+uninstall-am: uninstall-pluginLTLIBRARIES
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	clean-recursive ctags ctags-recursive distclean \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	clean-pluginLTLIBRARIES ctags ctags-recursive distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
-	install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
-	install-pluginLTLIBRARIES install-recursive install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	installdirs-recursive maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
-	tags-recursive uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-pluginLTLIBRARIES \
-	uninstall-recursive
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pluginLTLIBRARIES \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
+	uninstall-pluginLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/lib/plugins/stonith/Makefile.in
+++ b/lib/plugins/stonith/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,13 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +32,228 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+noinst_PROGRAMS = $(am__EXEEXT_1)
+subdir = lib/plugins/stonith
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/ribcl.py.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES = ribcl.py
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(plugindir)" \
+	"$(DESTDIR)$(stonithscriptdir)"
+pluginLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(plugin_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+apcmaster_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am__objects_1 =
+am_apcmaster_la_OBJECTS = apcmaster.lo $(am__objects_1)
+apcmaster_la_OBJECTS = $(am_apcmaster_la_OBJECTS)
+apcmaster_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(apcmaster_la_LDFLAGS) $(LDFLAGS) -o $@
+apcmastersnmp_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_apcmastersnmp_la_OBJECTS = apcmastersnmp.lo $(am__objects_1)
+apcmastersnmp_la_OBJECTS = $(am_apcmastersnmp_la_OBJECTS)
+apcmastersnmp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(apcmastersnmp_la_LDFLAGS) $(LDFLAGS) -o $@
+@USE_APC_SNMP_TRUE@am_apcmastersnmp_la_rpath = -rpath $(plugindir)
+apcsmart_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_apcsmart_la_OBJECTS = apcsmart.lo $(am__objects_1)
+apcsmart_la_OBJECTS = $(am_apcsmart_la_OBJECTS)
+apcsmart_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(apcsmart_la_LDFLAGS) $(LDFLAGS) -o $@
+baytech_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_baytech_la_OBJECTS = baytech.lo $(am__objects_1)
+baytech_la_OBJECTS = $(am_baytech_la_OBJECTS)
+baytech_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(baytech_la_LDFLAGS) $(LDFLAGS) -o $@
+bladehpi_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_bladehpi_la_OBJECTS = bladehpi.lo $(am__objects_1)
+bladehpi_la_OBJECTS = $(am_bladehpi_la_OBJECTS)
+bladehpi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(bladehpi_la_LDFLAGS) $(LDFLAGS) -o $@
+@USE_OPENHPI_TRUE@am_bladehpi_la_rpath = -rpath $(plugindir)
+cyclades_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_cyclades_la_OBJECTS = cyclades.lo $(am__objects_1)
+cyclades_la_OBJECTS = $(am_cyclades_la_OBJECTS)
+cyclades_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(cyclades_la_LDFLAGS) $(LDFLAGS) -o $@
+drac3_la_LIBADD =
+am_drac3_la_OBJECTS = drac3.lo drac3_command.lo drac3_hash.lo \
+	$(am__objects_1)
+drac3_la_OBJECTS = $(am_drac3_la_OBJECTS)
+drac3_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(drac3_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+@USE_DRAC3_TRUE@am_drac3_la_rpath = -rpath $(plugindir)
+external_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
+am_external_la_OBJECTS = external.lo $(am__objects_1)
+external_la_OBJECTS = $(am_external_la_OBJECTS)
+external_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(external_la_LDFLAGS) $(LDFLAGS) -o $@
+ibmhmc_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la \
+	$(am__DEPENDENCIES_1)
+am_ibmhmc_la_OBJECTS = ibmhmc.lo $(am__objects_1)
+ibmhmc_la_OBJECTS = $(am_ibmhmc_la_OBJECTS)
+ibmhmc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(ibmhmc_la_LDFLAGS) $(LDFLAGS) -o $@
+ipmilan_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am_ipmilan_la_OBJECTS = ipmilan.lo ipmilan_command.lo $(am__objects_1)
+ipmilan_la_OBJECTS = $(am_ipmilan_la_OBJECTS)
+ipmilan_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(ipmilan_la_LDFLAGS) $(LDFLAGS) -o $@
+@IPMILAN_BUILD_TRUE@am_ipmilan_la_rpath = -rpath $(plugindir)
+meatware_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_meatware_la_OBJECTS = meatware.lo $(am__objects_1)
+meatware_la_OBJECTS = $(am_meatware_la_OBJECTS)
+meatware_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(meatware_la_LDFLAGS) $(LDFLAGS) -o $@
+null_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_null_la_OBJECTS = null.lo $(am__objects_1)
+null_la_OBJECTS = $(am_null_la_OBJECTS)
+null_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(null_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+nw_rpc100s_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la \
+	$(am__DEPENDENCIES_1)
+am_nw_rpc100s_la_OBJECTS = nw_rpc100s.lo $(am__objects_1)
+nw_rpc100s_la_OBJECTS = $(am_nw_rpc100s_la_OBJECTS)
+nw_rpc100s_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(nw_rpc100s_la_LDFLAGS) $(LDFLAGS) -o $@
+rcd_serial_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_rcd_serial_la_OBJECTS = rcd_serial.lo $(am__objects_1)
+rcd_serial_la_OBJECTS = $(am_rcd_serial_la_OBJECTS)
+rcd_serial_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(rcd_serial_la_LDFLAGS) $(LDFLAGS) -o $@
+rps10_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_rps10_la_OBJECTS = rps10.lo $(am__objects_1)
+rps10_la_OBJECTS = $(am_rps10_la_OBJECTS)
+rps10_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(rps10_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+ssh_la_LIBADD =
+am_ssh_la_OBJECTS = ssh.lo $(am__objects_1)
+ssh_la_OBJECTS = $(am_ssh_la_OBJECTS)
+ssh_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(ssh_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+suicide_la_LIBADD =
+am_suicide_la_OBJECTS = suicide.lo $(am__objects_1)
+suicide_la_OBJECTS = $(am_suicide_la_OBJECTS)
+suicide_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(suicide_la_LDFLAGS) $(LDFLAGS) -o $@
+vacm_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
+am_vacm_la_OBJECTS = vacm.lo $(am__objects_1)
+vacm_la_OBJECTS = $(am_vacm_la_OBJECTS)
+vacm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(vacm_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+@USE_VACM_TRUE@am_vacm_la_rpath = -rpath $(plugindir)
+wti_nps_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la \
+	$(am__DEPENDENCIES_1)
+am_wti_nps_la_OBJECTS = wti_nps.lo $(am__objects_1)
+wti_nps_la_OBJECTS = $(am_wti_nps_la_OBJECTS)
+wti_nps_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(wti_nps_la_LDFLAGS) $(LDFLAGS) -o $@
+@IPMILAN_BUILD_TRUE@am__EXEEXT_1 = ipmilantest$(EXEEXT)
+PROGRAMS = $(noinst_PROGRAMS)
+am_ipmilantest_OBJECTS = ipmilan_test.$(OBJEXT)
+ipmilantest_OBJECTS = $(am_ipmilantest_OBJECTS)
+@IPMILAN_BUILD_TRUE@am__DEPENDENCIES_2 = ipmilan.la
+ipmilantest_DEPENDENCIES = $(top_builddir)/lib/pils/libpils.la \
+	$(top_builddir)/lib/stonith/libstonith.la \
+	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
+stonithscriptSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(stonithscript_SCRIPTS)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(apcmaster_la_SOURCES) $(apcmastersnmp_la_SOURCES) \
+	$(apcsmart_la_SOURCES) $(baytech_la_SOURCES) \
+	$(bladehpi_la_SOURCES) $(cyclades_la_SOURCES) \
+	$(drac3_la_SOURCES) $(external_la_SOURCES) \
+	$(ibmhmc_la_SOURCES) $(ipmilan_la_SOURCES) \
+	$(meatware_la_SOURCES) $(null_la_SOURCES) \
+	$(nw_rpc100s_la_SOURCES) $(rcd_serial_la_SOURCES) \
+	$(rps10_la_SOURCES) $(ssh_la_SOURCES) $(suicide_la_SOURCES) \
+	$(vacm_la_SOURCES) $(wti_nps_la_SOURCES) \
+	$(ipmilantest_SOURCES)
+DIST_SOURCES = $(apcmaster_la_SOURCES) $(apcmastersnmp_la_SOURCES) \
+	$(apcsmart_la_SOURCES) $(baytech_la_SOURCES) \
+	$(bladehpi_la_SOURCES) $(cyclades_la_SOURCES) \
+	$(drac3_la_SOURCES) $(external_la_SOURCES) \
+	$(ibmhmc_la_SOURCES) $(ipmilan_la_SOURCES) \
+	$(meatware_la_SOURCES) $(null_la_SOURCES) \
+	$(nw_rpc100s_la_SOURCES) $(rcd_serial_la_SOURCES) \
+	$(rps10_la_SOURCES) $(ssh_la_SOURCES) $(suicide_la_SOURCES) \
+	$(vacm_la_SOURCES) $(wti_nps_la_SOURCES) \
+	$(ipmilantest_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +276,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +319,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +330,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +338,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +357,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +365,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +400,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +420,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +430,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +439,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +459,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +481,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +496,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # stonith: STONITH plugins for Linux-HA
@@ -361,25 +526,20 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 SUBDIRS = external
-
 INCFILES = stonith_expect_helpers.h	\
 			stonith_plugin_common.h		\
 			stonith_signal.h		\
 			stonith_config_xml.h
 
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
 			-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha  \
 			-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
 
-
 AM_CFLAGS = @NON_FATAL_CFLAGS@ -DST_TEXTDOMAIN='"@STONITHPKG@"' \
 			-DSTONITH_MODULES='"$(stonithlibdir)"' \
 			-DLOCALEDIR='"@LOCALE@"' 		
 
-
 EXTRA_DIST = README.meatware README.rcd_serial README.vacm README.drac3 README.ipmilan README.cyclades README.bladehpi
 @USE_VACM_FALSE@vacm_LIB = 
 
@@ -388,7 +548,7 @@
 #       plugin work.
 #
 @USE_VACM_TRUE@vacm_LIB = vacm.la
-
+@USE_APC_SNMP_FALSE@apcmastersnmp_LIB = 
 
 #
 #       We need <ucd-snmp/asn1.h>, <ucd-snmp/snmp_api.h>, <ucd-snmp/snmp.h>
@@ -396,36 +556,31 @@
 #       for the apcmastersnmp plugin to work
 #
 @USE_APC_SNMP_TRUE@apcmastersnmp_LIB = apcmastersnmp.la
-@USE_APC_SNMP_FALSE@apcmastersnmp_LIB = 
-@IPMILAN_BUILD_TRUE@OPENIPMI_LIB = -lOpenIPMI -lOpenIPMIposix -lOpenIPMIutils
 @IPMILAN_BUILD_FALSE@OPENIPMI_LIB = 
-@IPMILAN_BUILD_TRUE@ipmilan_LIB = ipmilan.la
+@IPMILAN_BUILD_TRUE@OPENIPMI_LIB = -lOpenIPMI -lOpenIPMIposix -lOpenIPMIutils
 @IPMILAN_BUILD_FALSE@ipmilan_LIB = 
+@IPMILAN_BUILD_TRUE@ipmilan_LIB = ipmilan.la
 @IPMILAN_BUILD_TRUE@ipmilan_TEST = ipmilantest
+@USE_DRAC3_FALSE@drac3_LIB = 
 #
 #       We need <curl/curl.h>, <libxml/xmlmemory.h>, 
 #       <libxml/parser.h>, <libxml/xpath.h>, 
 #       -lcurl and -lxml2 for the drac3 plugin to work
 #
 @USE_DRAC3_TRUE@drac3_LIB = drac3.la
-@USE_DRAC3_FALSE@drac3_LIB = 
+@USE_OPENHPI_FALSE@bladehpi_LIB = 
 
 #
 #       We need OpenHPI to make the IBM BladeCenter plugin work.
 #
 @USE_OPENHPI_TRUE@bladehpi_LIB = bladehpi.la
-@USE_OPENHPI_FALSE@bladehpi_LIB = 
-
-noinst_PROGRAMS = $(ipmilan_TEST)
 ipmilantest_SOURCES = ipmilan_test.c 
 ipmilantest_LDADD = $(top_builddir)/lib/pils/libpils.la \
 		    $(top_builddir)/lib/stonith/libstonith.la \
 		    $(ipmilan_LIB) \
 		    $(OPENIPMI_LIB)
 
-
 plugindir = $(stonith_plugindir)/stonith2
-
 plugin_LTLIBRARIES = apcmaster.la	\
 			$(apcmastersnmp_LIB)	\
 			apcsmart.la		\
@@ -446,291 +601,164 @@
 			$(vacm_LIB)		\
 			wti_nps.la
 
-
 apcmaster_la_SOURCES = apcmaster.c $(INCFILES)
 apcmaster_la_LDFLAGS = -export-dynamic -module -avoid-version
 apcmaster_la_LIBADD = $(GLIBLIB)
-
 apcmastersnmp_la_SOURCES = apcmastersnmp.c $(INCFILES)
 apcmastersnmp_la_LDFLAGS = -export-dynamic -module -avoid-version @SNMPLIB@ \
 			  @CRYPTOLIB@
 
 apcmastersnmp_la_LIBADD = $(GLIBLIB)
-
 apcsmart_la_SOURCES = apcsmart.c $(INCFILES)
 apcsmart_la_LDFLAGS = -export-dynamic -module -avoid-version
 apcsmart_la_LIBADD = $(GLIBLIB)
-
 baytech_la_SOURCES = baytech.c $(INCFILES)
 baytech_la_LDFLAGS = -export-dynamic -module -avoid-version
 baytech_la_LIBADD = $(GLIBLIB)
-
 bladehpi_la_SOURCES = bladehpi.c $(INCFILES)
 bladehpi_la_LDFLAGS = -export-dynamic -module -avoid-version
 bladehpi_la_LIBADD = $(GLIBLIB) -lopenhpi
-
 cyclades_la_SOURCES = cyclades.c $(INCFILES)
 cyclades_la_LDFLAGS = -export-dynamic -module -avoid-version
 cyclades_la_LIBADD = $(GLIBLIB)
-
 drac3_la_SOURCES = drac3.c drac3_command.c drac3_command.h drac3_hash.c drac3_hash.h	$(INCFILES)
 drac3_la_LDFLAGS = -export-dynamic -module -avoid-version -lcurl -lxml2 $(GLIBLIB)
-
 external_la_SOURCES = external.c	$(INCFILES)
 external_la_LDFLAGS = -export-dynamic -module -avoid-version
 external_la_LIBADD = $(top_builddir)/replace/libreplace.la
-
 ibmhmc_la_SOURCES = ibmhmc.c	$(INCFILES)
 ibmhmc_la_LDFLAGS = -export-dynamic -module -avoid-version
 ibmhmc_la_LIBADD = $(top_builddir)/replace/libreplace.la $(GLIBLIB)
-
 ipmilan_la_SOURCES = ipmilan.c ipmilan.h ipmilan_command.c	$(INCFILES)
 ipmilan_la_LDFLAGS = -export-dynamic -module -avoid-version
 ipmilan_la_LIBADD = $(top_builddir)/replace/libreplace.la $(OPENIPMI_LIB) $(GLIBLIB)
-
 meatware_la_SOURCES = meatware.c $(INCFILES)
 meatware_la_LDFLAGS = -export-dynamic -module -avoid-version
 meatware_la_LIBADD = $(GLIBLIB)
-
 null_la_SOURCES = null.c $(INCFILES)
 null_la_LDFLAGS = -export-dynamic -module -avoid-version
 null_la_LIBADD = $(GLIBLIB)
-
 nw_rpc100s_la_SOURCES = nw_rpc100s.c $(INCFILES)
 nw_rpc100s_la_LDFLAGS = -export-dynamic -module -avoid-version
 nw_rpc100s_la_LIBADD = $(top_builddir)/replace/libreplace.la $(GLIBLIB)
-
 rcd_serial_la_SOURCES = rcd_serial.c $(INCFILES)
 rcd_serial_la_LDFLAGS = -export-dynamic -module -avoid-version
 rcd_serial_la_LIBADD = $(GLIBLIB)
-
 rps10_la_SOURCES = rps10.c $(INCFILES)
 rps10_la_LDFLAGS = -export-dynamic -module -avoid-version
 rps10_la_LIBADD = $(GLIBLIB)
-
 ssh_la_SOURCES = ssh.c $(INCFILES)
 ssh_la_LDFLAGS = -export-dynamic -module -avoid-version
-
 vacm_la_SOURCES = vacm.c $(INCFILES)
 vacm_la_LDFLAGS = -export-dynamic -module -avoid-version
 vacm_la_LIBADD = $(top_builddir)/replace/libreplace.la
-
 wti_nps_la_SOURCES = wti_nps.c $(INCFILES)
 wti_nps_la_LDFLAGS = -export-dynamic -module -avoid-version
 wti_nps_la_LIBADD = $(top_builddir)/replace/libreplace.la $(GLIBLIB)
-
 suicide_la_SOURCES = suicide.c $(INCFILES)
 suicide_la_LDFLAGS = -export-dynamic -module -avoid-version
-
 stonithscriptdir = $(stonith_plugindir)/stonith2
-
 stonithscript_SCRIPTS = ribcl.py 
-subdir = lib/plugins/stonith
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES = ribcl.py
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-
-apcmaster_la_DEPENDENCIES =
-am__objects_1 =
-am_apcmaster_la_OBJECTS = apcmaster.lo $(am__objects_1)
-apcmaster_la_OBJECTS = $(am_apcmaster_la_OBJECTS)
-apcmastersnmp_la_DEPENDENCIES =
-am_apcmastersnmp_la_OBJECTS = apcmastersnmp.lo $(am__objects_1)
-apcmastersnmp_la_OBJECTS = $(am_apcmastersnmp_la_OBJECTS)
-apcsmart_la_DEPENDENCIES =
-am_apcsmart_la_OBJECTS = apcsmart.lo $(am__objects_1)
-apcsmart_la_OBJECTS = $(am_apcsmart_la_OBJECTS)
-baytech_la_DEPENDENCIES =
-am_baytech_la_OBJECTS = baytech.lo $(am__objects_1)
-baytech_la_OBJECTS = $(am_baytech_la_OBJECTS)
-bladehpi_la_DEPENDENCIES =
-am_bladehpi_la_OBJECTS = bladehpi.lo $(am__objects_1)
-bladehpi_la_OBJECTS = $(am_bladehpi_la_OBJECTS)
-cyclades_la_DEPENDENCIES =
-am_cyclades_la_OBJECTS = cyclades.lo $(am__objects_1)
-cyclades_la_OBJECTS = $(am_cyclades_la_OBJECTS)
-drac3_la_LIBADD =
-am_drac3_la_OBJECTS = drac3.lo drac3_command.lo drac3_hash.lo \
-	$(am__objects_1)
-drac3_la_OBJECTS = $(am_drac3_la_OBJECTS)
-external_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
-am_external_la_OBJECTS = external.lo $(am__objects_1)
-external_la_OBJECTS = $(am_external_la_OBJECTS)
-ibmhmc_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
-am_ibmhmc_la_OBJECTS = ibmhmc.lo $(am__objects_1)
-ibmhmc_la_OBJECTS = $(am_ibmhmc_la_OBJECTS)
-@IPMILAN_BUILD_TRUE@ipmilan_la_DEPENDENCIES = \
-@IPMILAN_BUILD_TRUE@	$(top_builddir)/replace/libreplace.la
-@IPMILAN_BUILD_FALSE@ipmilan_la_DEPENDENCIES = \
-@IPMILAN_BUILD_FALSE@	$(top_builddir)/replace/libreplace.la
-am_ipmilan_la_OBJECTS = ipmilan.lo ipmilan_command.lo $(am__objects_1)
-ipmilan_la_OBJECTS = $(am_ipmilan_la_OBJECTS)
-meatware_la_DEPENDENCIES =
-am_meatware_la_OBJECTS = meatware.lo $(am__objects_1)
-meatware_la_OBJECTS = $(am_meatware_la_OBJECTS)
-null_la_DEPENDENCIES =
-am_null_la_OBJECTS = null.lo $(am__objects_1)
-null_la_OBJECTS = $(am_null_la_OBJECTS)
-nw_rpc100s_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
-am_nw_rpc100s_la_OBJECTS = nw_rpc100s.lo $(am__objects_1)
-nw_rpc100s_la_OBJECTS = $(am_nw_rpc100s_la_OBJECTS)
-rcd_serial_la_DEPENDENCIES =
-am_rcd_serial_la_OBJECTS = rcd_serial.lo $(am__objects_1)
-rcd_serial_la_OBJECTS = $(am_rcd_serial_la_OBJECTS)
-rps10_la_DEPENDENCIES =
-am_rps10_la_OBJECTS = rps10.lo $(am__objects_1)
-rps10_la_OBJECTS = $(am_rps10_la_OBJECTS)
-ssh_la_LIBADD =
-am_ssh_la_OBJECTS = ssh.lo $(am__objects_1)
-ssh_la_OBJECTS = $(am_ssh_la_OBJECTS)
-suicide_la_LIBADD =
-am_suicide_la_OBJECTS = suicide.lo $(am__objects_1)
-suicide_la_OBJECTS = $(am_suicide_la_OBJECTS)
-vacm_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
-am_vacm_la_OBJECTS = vacm.lo $(am__objects_1)
-vacm_la_OBJECTS = $(am_vacm_la_OBJECTS)
-wti_nps_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
-am_wti_nps_la_OBJECTS = wti_nps.lo $(am__objects_1)
-wti_nps_la_OBJECTS = $(am_wti_nps_la_OBJECTS)
-@IPMILAN_BUILD_TRUE@noinst_PROGRAMS = ipmilantest$(EXEEXT)
-@IPMILAN_BUILD_FALSE@noinst_PROGRAMS =
-PROGRAMS = $(noinst_PROGRAMS)
-
-am_ipmilantest_OBJECTS = ipmilan_test.$(OBJEXT)
-ipmilantest_OBJECTS = $(am_ipmilantest_OBJECTS)
-@IPMILAN_BUILD_TRUE@ipmilantest_DEPENDENCIES = \
-@IPMILAN_BUILD_TRUE@	$(top_builddir)/lib/pils/libpils.la \
-@IPMILAN_BUILD_TRUE@	$(top_builddir)/lib/stonith/libstonith.la \
-@IPMILAN_BUILD_TRUE@	ipmilan.la
-@IPMILAN_BUILD_FALSE@ipmilantest_DEPENDENCIES = \
-@IPMILAN_BUILD_FALSE@	$(top_builddir)/lib/pils/libpils.la \
-@IPMILAN_BUILD_FALSE@	$(top_builddir)/lib/stonith/libstonith.la
-ipmilantest_LDFLAGS =
-SCRIPTS = $(stonithscript_SCRIPTS)
-
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/apcmaster.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/apcmastersnmp.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/apcsmart.Plo ./$(DEPDIR)/baytech.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/bladehpi.Plo ./$(DEPDIR)/cyclades.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/drac3.Plo ./$(DEPDIR)/drac3_command.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/drac3_hash.Plo ./$(DEPDIR)/external.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/ibmhmc.Plo ./$(DEPDIR)/ipmilan.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/ipmilan_command.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/ipmilan_test.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/meatware.Plo ./$(DEPDIR)/null.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/nw_rpc100s.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/rcd_serial.Plo ./$(DEPDIR)/rps10.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/ssh.Plo ./$(DEPDIR)/suicide.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/vacm.Plo ./$(DEPDIR)/wti_nps.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(apcmaster_la_SOURCES) $(apcmastersnmp_la_SOURCES) \
-	$(apcsmart_la_SOURCES) $(baytech_la_SOURCES) \
-	$(bladehpi_la_SOURCES) $(cyclades_la_SOURCES) \
-	$(drac3_la_SOURCES) $(external_la_SOURCES) $(ibmhmc_la_SOURCES) \
-	$(ipmilan_la_SOURCES) $(meatware_la_SOURCES) $(null_la_SOURCES) \
-	$(nw_rpc100s_la_SOURCES) $(rcd_serial_la_SOURCES) \
-	$(rps10_la_SOURCES) $(ssh_la_SOURCES) $(suicide_la_SOURCES) \
-	$(vacm_la_SOURCES) $(wti_nps_la_SOURCES) $(ipmilantest_SOURCES)
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ribcl.py.in
-DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(apcmaster_la_SOURCES) $(apcmastersnmp_la_SOURCES) $(apcsmart_la_SOURCES) $(baytech_la_SOURCES) $(bladehpi_la_SOURCES) $(cyclades_la_SOURCES) $(drac3_la_SOURCES) $(external_la_SOURCES) $(ibmhmc_la_SOURCES) $(ipmilan_la_SOURCES) $(meatware_la_SOURCES) $(null_la_SOURCES) $(nw_rpc100s_la_SOURCES) $(rcd_serial_la_SOURCES) $(rps10_la_SOURCES) $(ssh_la_SOURCES) $(suicide_la_SOURCES) $(vacm_la_SOURCES) $(wti_nps_la_SOURCES) $(ipmilantest_SOURCES)
-
 all: all-recursive
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/plugins/stonith/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/plugins/stonith/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-ribcl.py: $(top_builddir)/config.status ribcl.py.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ribcl.py: $(top_builddir)/config.status $(srcdir)/ribcl.py.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-pluginLTLIBRARIES_INSTALL = $(INSTALL)
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(plugindir)
+	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-pluginLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
 	done
 
 clean-pluginLTLIBRARIES:
 	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 apcmaster.la: $(apcmaster_la_OBJECTS) $(apcmaster_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(apcmaster_la_LDFLAGS) $(apcmaster_la_OBJECTS) $(apcmaster_la_LIBADD) $(LIBS)
+	$(apcmaster_la_LINK) -rpath $(plugindir) $(apcmaster_la_OBJECTS) $(apcmaster_la_LIBADD) $(LIBS)
 apcmastersnmp.la: $(apcmastersnmp_la_OBJECTS) $(apcmastersnmp_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(apcmastersnmp_la_LDFLAGS) $(apcmastersnmp_la_OBJECTS) $(apcmastersnmp_la_LIBADD) $(LIBS)
+	$(apcmastersnmp_la_LINK) $(am_apcmastersnmp_la_rpath) $(apcmastersnmp_la_OBJECTS) $(apcmastersnmp_la_LIBADD) $(LIBS)
 apcsmart.la: $(apcsmart_la_OBJECTS) $(apcsmart_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(apcsmart_la_LDFLAGS) $(apcsmart_la_OBJECTS) $(apcsmart_la_LIBADD) $(LIBS)
+	$(apcsmart_la_LINK) -rpath $(plugindir) $(apcsmart_la_OBJECTS) $(apcsmart_la_LIBADD) $(LIBS)
 baytech.la: $(baytech_la_OBJECTS) $(baytech_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(baytech_la_LDFLAGS) $(baytech_la_OBJECTS) $(baytech_la_LIBADD) $(LIBS)
+	$(baytech_la_LINK) -rpath $(plugindir) $(baytech_la_OBJECTS) $(baytech_la_LIBADD) $(LIBS)
 bladehpi.la: $(bladehpi_la_OBJECTS) $(bladehpi_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(bladehpi_la_LDFLAGS) $(bladehpi_la_OBJECTS) $(bladehpi_la_LIBADD) $(LIBS)
+	$(bladehpi_la_LINK) $(am_bladehpi_la_rpath) $(bladehpi_la_OBJECTS) $(bladehpi_la_LIBADD) $(LIBS)
 cyclades.la: $(cyclades_la_OBJECTS) $(cyclades_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(cyclades_la_LDFLAGS) $(cyclades_la_OBJECTS) $(cyclades_la_LIBADD) $(LIBS)
+	$(cyclades_la_LINK) -rpath $(plugindir) $(cyclades_la_OBJECTS) $(cyclades_la_LIBADD) $(LIBS)
 drac3.la: $(drac3_la_OBJECTS) $(drac3_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(drac3_la_LDFLAGS) $(drac3_la_OBJECTS) $(drac3_la_LIBADD) $(LIBS)
+	$(drac3_la_LINK) $(am_drac3_la_rpath) $(drac3_la_OBJECTS) $(drac3_la_LIBADD) $(LIBS)
 external.la: $(external_la_OBJECTS) $(external_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(external_la_LDFLAGS) $(external_la_OBJECTS) $(external_la_LIBADD) $(LIBS)
+	$(external_la_LINK) -rpath $(plugindir) $(external_la_OBJECTS) $(external_la_LIBADD) $(LIBS)
 ibmhmc.la: $(ibmhmc_la_OBJECTS) $(ibmhmc_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(ibmhmc_la_LDFLAGS) $(ibmhmc_la_OBJECTS) $(ibmhmc_la_LIBADD) $(LIBS)
+	$(ibmhmc_la_LINK) -rpath $(plugindir) $(ibmhmc_la_OBJECTS) $(ibmhmc_la_LIBADD) $(LIBS)
 ipmilan.la: $(ipmilan_la_OBJECTS) $(ipmilan_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(ipmilan_la_LDFLAGS) $(ipmilan_la_OBJECTS) $(ipmilan_la_LIBADD) $(LIBS)
+	$(ipmilan_la_LINK) $(am_ipmilan_la_rpath) $(ipmilan_la_OBJECTS) $(ipmilan_la_LIBADD) $(LIBS)
 meatware.la: $(meatware_la_OBJECTS) $(meatware_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(meatware_la_LDFLAGS) $(meatware_la_OBJECTS) $(meatware_la_LIBADD) $(LIBS)
+	$(meatware_la_LINK) -rpath $(plugindir) $(meatware_la_OBJECTS) $(meatware_la_LIBADD) $(LIBS)
 null.la: $(null_la_OBJECTS) $(null_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(null_la_LDFLAGS) $(null_la_OBJECTS) $(null_la_LIBADD) $(LIBS)
+	$(null_la_LINK) -rpath $(plugindir) $(null_la_OBJECTS) $(null_la_LIBADD) $(LIBS)
 nw_rpc100s.la: $(nw_rpc100s_la_OBJECTS) $(nw_rpc100s_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(nw_rpc100s_la_LDFLAGS) $(nw_rpc100s_la_OBJECTS) $(nw_rpc100s_la_LIBADD) $(LIBS)
+	$(nw_rpc100s_la_LINK) -rpath $(plugindir) $(nw_rpc100s_la_OBJECTS) $(nw_rpc100s_la_LIBADD) $(LIBS)
 rcd_serial.la: $(rcd_serial_la_OBJECTS) $(rcd_serial_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(rcd_serial_la_LDFLAGS) $(rcd_serial_la_OBJECTS) $(rcd_serial_la_LIBADD) $(LIBS)
+	$(rcd_serial_la_LINK) -rpath $(plugindir) $(rcd_serial_la_OBJECTS) $(rcd_serial_la_LIBADD) $(LIBS)
 rps10.la: $(rps10_la_OBJECTS) $(rps10_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(rps10_la_LDFLAGS) $(rps10_la_OBJECTS) $(rps10_la_LIBADD) $(LIBS)
+	$(rps10_la_LINK) -rpath $(plugindir) $(rps10_la_OBJECTS) $(rps10_la_LIBADD) $(LIBS)
 ssh.la: $(ssh_la_OBJECTS) $(ssh_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(ssh_la_LDFLAGS) $(ssh_la_OBJECTS) $(ssh_la_LIBADD) $(LIBS)
+	$(ssh_la_LINK) -rpath $(plugindir) $(ssh_la_OBJECTS) $(ssh_la_LIBADD) $(LIBS)
 suicide.la: $(suicide_la_OBJECTS) $(suicide_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(suicide_la_LDFLAGS) $(suicide_la_OBJECTS) $(suicide_la_LIBADD) $(LIBS)
+	$(suicide_la_LINK) -rpath $(plugindir) $(suicide_la_OBJECTS) $(suicide_la_LIBADD) $(LIBS)
 vacm.la: $(vacm_la_OBJECTS) $(vacm_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(vacm_la_LDFLAGS) $(vacm_la_OBJECTS) $(vacm_la_LIBADD) $(LIBS)
+	$(vacm_la_LINK) $(am_vacm_la_rpath) $(vacm_la_OBJECTS) $(vacm_la_LIBADD) $(LIBS)
 wti_nps.la: $(wti_nps_la_OBJECTS) $(wti_nps_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(wti_nps_la_LDFLAGS) $(wti_nps_la_OBJECTS) $(wti_nps_la_LIBADD) $(LIBS)
+	$(wti_nps_la_LINK) -rpath $(plugindir) $(wti_nps_la_OBJECTS) $(wti_nps_la_LIBADD) $(LIBS)
 
 clean-noinstPROGRAMS:
 	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
@@ -740,17 +768,16 @@
 	done
 ipmilantest$(EXEEXT): $(ipmilantest_OBJECTS) $(ipmilantest_DEPENDENCIES) 
 	@rm -f ipmilantest$(EXEEXT)
-	$(LINK) $(ipmilantest_LDFLAGS) $(ipmilantest_OBJECTS) $(ipmilantest_LDADD) $(LIBS)
-stonithscriptSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+	$(LINK) $(ipmilantest_OBJECTS) $(ipmilantest_LDADD) $(LIBS)
 install-stonithscriptSCRIPTS: $(stonithscript_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(stonithscriptdir)
+	test -z "$(stonithscriptdir)" || $(MKDIR_P) "$(DESTDIR)$(stonithscriptdir)"
 	@list='$(stonithscript_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(stonithscriptSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(stonithscriptdir)/$$f"; \
-	    $(stonithscriptSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(stonithscriptdir)/$$f; \
+	    echo " $(stonithscriptSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(stonithscriptdir)/$$f'"; \
+	    $(stonithscriptSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(stonithscriptdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -758,12 +785,12 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(stonithscript_SCRIPTS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f $(DESTDIR)$(stonithscriptdir)/$$f"; \
-	  rm -f $(DESTDIR)$(stonithscriptdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(stonithscriptdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(stonithscriptdir)/$$f"; \
 	done
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -793,37 +820,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wti_nps.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -831,10 +846,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -842,7 +853,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -854,15 +871,20 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -883,7 +905,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -894,14 +916,6 @@
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -910,19 +924,22 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -932,10 +949,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -958,28 +976,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -990,15 +1003,19 @@
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -1008,8 +1025,9 @@
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS)
 installdirs: installdirs-recursive
 installdirs-am:
-	$(mkinstalldirs) $(DESTDIR)$(plugindir) $(DESTDIR)$(stonithscriptdir)
-
+	for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(stonithscriptdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -1029,7 +1047,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -1044,24 +1062,35 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
+html: html-recursive
+
 info: info-recursive
 
 info-am:
 
-install-data-am: install-pluginLTLIBRARIES install-stonithscriptSCRIPTS
+install-data-am: install-pluginLTLIBRARIES \
+	install-stonithscriptSCRIPTS
+
+install-dvi: install-dvi-recursive
 
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -1082,30 +1111,28 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-pluginLTLIBRARIES \
+uninstall-am: uninstall-pluginLTLIBRARIES \
 	uninstall-stonithscriptSCRIPTS
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-noinstPROGRAMS \
-	clean-pluginLTLIBRARIES clean-recursive ctags ctags-recursive \
-	distclean distclean-compile distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
-	install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
-	install-pluginLTLIBRARIES install-recursive \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	clean-noinstPROGRAMS clean-pluginLTLIBRARIES ctags \
+	ctags-recursive distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pluginLTLIBRARIES install-ps install-ps-am \
 	install-stonithscriptSCRIPTS install-strip installcheck \
-	installcheck-am installdirs installdirs-am \
-	installdirs-recursive maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
-	tags-recursive uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-pluginLTLIBRARIES \
-	uninstall-recursive uninstall-stonithscriptSCRIPTS
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
+	uninstall-pluginLTLIBRARIES uninstall-stonithscriptSCRIPTS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/lib/plugins/stonith/external/Makefile.in
+++ b/lib/plugins/stonith/external/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,42 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = lib/plugins/stonith/external
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/ibmrsa.in $(srcdir)/riloe.in $(srcdir)/ssh.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES = ibmrsa riloe ssh
+am__installdirs = "$(DESTDIR)$(extdir)"
+extSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(ext_SCRIPTS)
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +88,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +131,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +142,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +150,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +169,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +177,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +212,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +232,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +242,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +251,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +271,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +293,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +308,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 # Makefile.am for OCF RAs
 #
@@ -361,47 +338,56 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 EXTRA_DIST = ibmrsa-telnet ipmi rackpdu vmware
-
 extdir = $(stonith_ext_plugindir)
-
 ext_SCRIPTS = ibmrsa ibmrsa-telnet ipmi riloe ssh vmware rackpdu
-subdir = lib/plugins/stonith/external
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES = ibmrsa riloe ssh
-SCRIPTS = $(ext_SCRIPTS)
-
-DIST_SOURCES =
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ibmrsa.in riloe.in \
-	ssh.in
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/plugins/stonith/external/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/plugins/stonith/external/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-ibmrsa: $(top_builddir)/config.status ibmrsa.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ibmrsa: $(top_builddir)/config.status $(srcdir)/ibmrsa.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-riloe: $(top_builddir)/config.status riloe.in
+riloe: $(top_builddir)/config.status $(srcdir)/riloe.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-ssh: $(top_builddir)/config.status ssh.in
+ssh: $(top_builddir)/config.status $(srcdir)/ssh.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-extSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 install-extSCRIPTS: $(ext_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(extdir)
+	test -z "$(extdir)" || $(MKDIR_P) "$(DESTDIR)$(extdir)"
 	@list='$(ext_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(extSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(extdir)/$$f"; \
-	    $(extSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(extdir)/$$f; \
+	    echo " $(extSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(extdir)/$$f'"; \
+	    $(extSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(extdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -409,8 +395,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(ext_SCRIPTS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f $(DESTDIR)$(extdir)/$$f"; \
-	  rm -f $(DESTDIR)$(extdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(extdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(extdir)/$$f"; \
 	done
 
 mostlyclean-libtool:
@@ -418,38 +404,29 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
 ctags: CTAGS
 CTAGS:
 
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -463,9 +440,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(SCRIPTS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(extdir)
+	for dir in "$(DESTDIR)$(extdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -485,7 +463,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -497,24 +475,34 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-extSCRIPTS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -533,17 +521,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-extSCRIPTS uninstall-info-am
+uninstall-am: uninstall-extSCRIPTS
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-extSCRIPTS \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-extSCRIPTS uninstall-info-am
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-extSCRIPTS install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-extSCRIPTS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/lib/plugins/tiebreaker/Makefile.in
+++ b/lib/plugins/tiebreaker/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,77 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = lib/plugins/tiebreaker
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(plugindir)"
+pluginLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(plugin_LTLIBRARIES)
+twonodes_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
+am_twonodes_la_OBJECTS = twonodes.lo
+twonodes_la_OBJECTS = $(am_twonodes_la_OBJECTS)
+twonodes_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(twonodes_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(twonodes_la_SOURCES)
+DIST_SOURCES = $(twonodes_la_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +123,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +166,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +177,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +185,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +204,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +212,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +247,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +267,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +277,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +286,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +306,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +328,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +343,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # InterfaceMgr: Interface manager plugins for Linux-HA
@@ -361,100 +373,84 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 SUBDIRS = 
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
 			-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha  \
 			-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl  \
 			-I$(top_builddir)/lib/upmls -I$(top_srcdir)/lib/upmls
 
-
 AM_CFLAGS = @CFLAGS@
-
 halibdir = $(libdir)/@HB_PKG@
 plugindir = $(halibdir)/plugins/tiebreaker
 plugin_LTLIBRARIES = twonodes.la
-
 twonodes_la_SOURCES = twonodes.c
 twonodes_la_LDFLAGS = -export-dynamic -module -avoid-version -lz
 twonodes_la_LIBADD = $(top_builddir)/replace/libreplace.la 
-subdir = lib/plugins/tiebreaker
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-
-twonodes_la_DEPENDENCIES = $(top_builddir)/replace/libreplace.la
-am_twonodes_la_OBJECTS = twonodes.lo
-twonodes_la_OBJECTS = $(am_twonodes_la_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/twonodes.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(twonodes_la_SOURCES)
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(twonodes_la_SOURCES)
-
 all: all-recursive
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/plugins/tiebreaker/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/plugins/tiebreaker/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-pluginLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(plugindir)
+	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-pluginLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
 	done
 
 clean-pluginLTLIBRARIES:
 	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 twonodes.la: $(twonodes_la_OBJECTS) $(twonodes_la_DEPENDENCIES) 
-	$(LINK) -rpath $(plugindir) $(twonodes_la_LDFLAGS) $(twonodes_la_OBJECTS) $(twonodes_la_LIBADD) $(LIBS)
+	$(twonodes_la_LINK) -rpath $(plugindir) $(twonodes_la_OBJECTS) $(twonodes_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -462,37 +458,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/twonodes.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -500,10 +484,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -511,7 +491,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -523,15 +509,20 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -552,7 +543,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -563,14 +554,6 @@
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -579,19 +562,22 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -601,10 +587,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -627,28 +614,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -659,15 +641,19 @@
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -677,8 +663,9 @@
 all-am: Makefile $(LTLIBRARIES)
 installdirs: installdirs-recursive
 installdirs-am:
-	$(mkinstalldirs) $(DESTDIR)$(plugindir)
-
+	for dir in "$(DESTDIR)$(plugindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -698,7 +685,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -713,24 +700,34 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
+html: html-recursive
+
 info: info-recursive
 
 info-am:
 
 install-data-am: install-pluginLTLIBRARIES
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -751,28 +748,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-pluginLTLIBRARIES
+uninstall-am: uninstall-pluginLTLIBRARIES
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	clean-recursive ctags ctags-recursive distclean \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	clean-pluginLTLIBRARIES ctags ctags-recursive distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
-	install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
-	install-pluginLTLIBRARIES install-recursive install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	installdirs-recursive maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
-	tags-recursive uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-pluginLTLIBRARIES \
-	uninstall-recursive
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pluginLTLIBRARIES \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
+	uninstall-pluginLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/lib/recoverymgr/Makefile.in
+++ b/lib/recoverymgr/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,67 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = lib/recoverymgr
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+librecoverymgr_la_LIBADD =
+am_librecoverymgr_la_OBJECTS = recoverymgr.lo
+librecoverymgr_la_OBJECTS = $(am_librecoverymgr_la_OBJECTS)
+librecoverymgr_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(librecoverymgr_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(librecoverymgr_la_SOURCES)
+DIST_SOURCES = $(librecoverymgr_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +113,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +156,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +167,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +175,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +194,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +202,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +237,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +257,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +267,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +276,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +296,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +318,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +333,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # recoverymgr: Library that facilitates connecting to apphbd 
@@ -362,89 +364,80 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
 			-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha
 
-
 AM_CFLAGS = @CFLAGS@
-
 lib_LTLIBRARIES = librecoverymgr.la
-
 librecoverymgr_la_SOURCES = \
 				recoverymgr.c	
 
-
 librecoverymgr_la_LDFLAGS = -version-info 1:0:0 
-subdir = lib/recoverymgr
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(lib_LTLIBRARIES)
-
-librecoverymgr_la_LIBADD =
-am_librecoverymgr_la_OBJECTS = recoverymgr.lo
-librecoverymgr_la_OBJECTS = $(am_librecoverymgr_la_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/recoverymgr.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(librecoverymgr_la_SOURCES)
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(librecoverymgr_la_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/recoverymgr/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/recoverymgr/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-libLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 librecoverymgr.la: $(librecoverymgr_la_OBJECTS) $(librecoverymgr_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(librecoverymgr_la_LDFLAGS) $(librecoverymgr_la_OBJECTS) $(librecoverymgr_la_LIBADD) $(LIBS)
+	$(librecoverymgr_la_LINK) -rpath $(libdir) $(librecoverymgr_la_OBJECTS) $(librecoverymgr_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -452,37 +445,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recoverymgr.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -490,18 +471,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -510,6 +479,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -521,10 +491,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -547,28 +518,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -582,9 +548,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	for dir in "$(DESTDIR)$(libdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -604,7 +571,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -619,24 +586,34 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -657,20 +634,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+uninstall-am: uninstall-libLTLIBRARIES
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-strip installcheck \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-libLTLIBRARIES
+	tags uninstall uninstall-am uninstall-libLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/lib/stonith/Makefile.in
+++ b/lib/stonith/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,12 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +31,88 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+sbin_PROGRAMS = stonith$(EXEEXT) meatclient$(EXEEXT)
+subdir = lib/stonith
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)" \
+	"$(DESTDIR)$(man8dir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+libstonith_la_DEPENDENCIES = $(top_builddir)/lib/pils/libpils.la \
+	$(top_builddir)/replace/libreplace.la $(am__DEPENDENCIES_1)
+am_libstonith_la_OBJECTS = expect.lo stonith.lo st_ttylock.lo
+libstonith_la_OBJECTS = $(am_libstonith_la_OBJECTS)
+libstonith_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libstonith_la_LDFLAGS) $(LDFLAGS) -o $@
+sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(sbin_PROGRAMS)
+am_meatclient_OBJECTS = meatclient.$(OBJEXT)
+meatclient_OBJECTS = $(am_meatclient_OBJECTS)
+meatclient_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_stonith_OBJECTS = main.$(OBJEXT)
+stonith_OBJECTS = $(am_stonith_OBJECTS)
+stonith_DEPENDENCIES = libstonith.la \
+	$(top_builddir)/lib/pils/libpils.la $(am__DEPENDENCIES_1)
+stonith_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(stonith_LDFLAGS) \
+	$(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libstonith_la_SOURCES) $(meatclient_SOURCES) \
+	$(stonith_SOURCES)
+DIST_SOURCES = $(libstonith_la_SOURCES) $(meatclient_SOURCES) \
+	$(stonith_SOURCES)
+man8dir = $(mandir)/man8
+NROFF = nroff
+MANS = $(man_MANS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +135,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +178,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +189,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +197,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +216,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +224,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +259,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +279,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +289,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +298,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +318,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +340,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +355,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # Stonith: Shoot The Node In The Head
@@ -361,134 +385,101 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
 			-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
 			-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
 
-
 AM_CFLAGS = @CFLAGS@ -DST_TEXTDOMAIN='"@STONITHPKG@"' \
 			-DSTONITH_MODULES='"@stonith_plugindir@"' \
 			-DLOCALEDIR='"@LOCALE@"'
 
-
-sbin_PROGRAMS = stonith meatclient
-
 stonith_SOURCES = main.c
-
 stonith_LDADD = libstonith.la $(top_builddir)/lib/pils/libpils.la $(GLIBLIB)
 stonith_LDFLAGS = @LIBADD_DL@ @LIBLTDL@ -export-dynamic @DLOPEN_FORCE_FLAGS@ @LIBADD_INTL@ 
-
 meatclient_SOURCES = meatclient.c 
 meatclient_LDADD = $(GLIBLIB)
-
 lib_LTLIBRARIES = libstonith.la
-
 libstonith_la_SOURCES = expect.c stonith.c st_ttylock.c
 libstonith_la_LDFLAGS = -version-info 1:0:0
 libstonith_la_LIBADD = $(top_builddir)/lib/pils/libpils.la	\
 			$(top_builddir)/replace/libreplace.la	\
 			$(GLIBLIB)
 
-
 man_MANS = stonith.8 meatclient.8
-
 EXTRA_DIST = $(man_MANS)
-subdir = lib/stonith
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(lib_LTLIBRARIES)
-
-libstonith_la_DEPENDENCIES = $(top_builddir)/lib/pils/libpils.la \
-	$(top_builddir)/replace/libreplace.la
-am_libstonith_la_OBJECTS = expect.lo stonith.lo st_ttylock.lo
-libstonith_la_OBJECTS = $(am_libstonith_la_OBJECTS)
-sbin_PROGRAMS = stonith$(EXEEXT) meatclient$(EXEEXT)
-PROGRAMS = $(sbin_PROGRAMS)
-
-am_meatclient_OBJECTS = meatclient.$(OBJEXT)
-meatclient_OBJECTS = $(am_meatclient_OBJECTS)
-meatclient_DEPENDENCIES =
-meatclient_LDFLAGS =
-am_stonith_OBJECTS = main.$(OBJEXT)
-stonith_OBJECTS = $(am_stonith_OBJECTS)
-stonith_DEPENDENCIES = libstonith.la $(top_builddir)/lib/pils/libpils.la
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/expect.Plo ./$(DEPDIR)/main.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/meatclient.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/st_ttylock.Plo ./$(DEPDIR)/stonith.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libstonith_la_SOURCES) $(meatclient_SOURCES) \
-	$(stonith_SOURCES)
-
-NROFF = nroff
-MANS = $(man_MANS)
-DIST_COMMON = README $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(libstonith_la_SOURCES) $(meatclient_SOURCES) $(stonith_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/stonith/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/stonith/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-libLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libstonith.la: $(libstonith_la_OBJECTS) $(libstonith_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libstonith_la_LDFLAGS) $(libstonith_la_OBJECTS) $(libstonith_la_LIBADD) $(LIBS)
-sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+	$(libstonith_la_LINK) -rpath $(libdir) $(libstonith_la_OBJECTS) $(libstonith_la_LIBADD) $(LIBS)
 install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(sbindir)
+	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -496,8 +487,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \
-	  rm -f $(DESTDIR)$(sbindir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(sbindir)/$$f"; \
 	done
 
 clean-sbinPROGRAMS:
@@ -508,13 +499,13 @@
 	done
 meatclient$(EXEEXT): $(meatclient_OBJECTS) $(meatclient_DEPENDENCIES) 
 	@rm -f meatclient$(EXEEXT)
-	$(LINK) $(meatclient_LDFLAGS) $(meatclient_OBJECTS) $(meatclient_LDADD) $(LIBS)
+	$(LINK) $(meatclient_OBJECTS) $(meatclient_LDADD) $(LIBS)
 stonith$(EXEEXT): $(stonith_OBJECTS) $(stonith_DEPENDENCIES) 
 	@rm -f stonith$(EXEEXT)
-	$(LINK) $(stonith_LDFLAGS) $(stonith_OBJECTS) $(stonith_LDADD) $(LIBS)
+	$(stonith_LINK) $(stonith_OBJECTS) $(stonith_LDADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -526,52 +517,34 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stonith.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-man8dir = $(mandir)/man8
 install-man8: $(man8_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(man8dir)
+	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
 	for i in $$l2; do \
@@ -590,8 +563,8 @@
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
 	done
 uninstall-man8:
 	@$(NORMAL_UNINSTALL)
@@ -611,18 +584,10 @@
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
-	  rm -f $(DESTDIR)$(man8dir)/$$inst; \
+	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
+	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -631,6 +596,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -642,10 +608,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -668,28 +635,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -703,9 +665,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(sbindir) $(DESTDIR)$(man8dir)
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -725,7 +688,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -740,24 +703,34 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-man
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES install-sbinPROGRAMS
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man: install-man8
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -778,23 +751,27 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES uninstall-man \
+uninstall-am: uninstall-libLTLIBRARIES uninstall-man \
 	uninstall-sbinPROGRAMS
 
 uninstall-man: uninstall-man8
 
+.MAKE: install-am install-strip
+
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool clean-sbinPROGRAMS ctags \
-	distclean distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-man8 \
-	install-sbinPROGRAMS install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am uninstall-libLTLIBRARIES \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libLTLIBRARIES install-man \
+	install-man8 install-pdf install-pdf-am install-ps \
+	install-ps-am install-sbinPROGRAMS install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-libLTLIBRARIES \
 	uninstall-man uninstall-man8 uninstall-sbinPROGRAMS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/logd/Makefile.in
+++ b/logd/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,73 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+ha_sbin_PROGRAMS = ha_logger$(EXEEXT)
+halib_PROGRAMS = ha_logd$(EXEEXT) logtest$(EXEEXT)
+subdir = logd
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(ha_sbindir)" "$(DESTDIR)$(halibdir)"
+ha_sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(ha_sbin_PROGRAMS) $(halib_PROGRAMS)
+am_ha_logd_OBJECTS = ha_logd.$(OBJEXT)
+ha_logd_OBJECTS = $(am_ha_logd_OBJECTS)
+am__DEPENDENCIES_1 =
+ha_logd_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
+	$(top_builddir)/lib/clplumbing/libplumbgpl.la \
+	$(am__DEPENDENCIES_1) $(top_builddir)/lib/apphb/libapphb.la
+am_ha_logger_OBJECTS = ha_logger.$(OBJEXT)
+ha_logger_OBJECTS = $(am_ha_logger_OBJECTS)
+ha_logger_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
+	$(am__DEPENDENCIES_1)
+am_logtest_OBJECTS = logtest.$(OBJEXT)
+logtest_OBJECTS = $(am_logtest_OBJECTS)
+logtest_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
+	$(am__DEPENDENCIES_1)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(ha_logd_SOURCES) $(ha_logger_SOURCES) $(logtest_SOURCES)
+DIST_SOURCES = $(ha_logd_SOURCES) $(ha_logger_SOURCES) \
+	$(logtest_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +119,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +162,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +173,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +181,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -173,14 +195,11 @@
 LIBNETDEFINES = @LIBNETDEFINES@
 LIBNETLIBS = @LIBNETLIBS@
 LIBOBJS = @LIBOBJS@
-
 LIBRT = @LIBRT@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -189,15 +208,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -227,8 +243,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -249,8 +263,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -261,20 +273,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -282,17 +282,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -300,6 +302,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -321,6 +324,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -335,12 +339,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # hbclient library: Linux-HA heartbeat code
@@ -363,98 +370,71 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
 			-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
 			-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
 
-
 halibdir = $(libdir)/@HB_PKG@
 ha_sbindir = $(sbindir)
 gliblib = @GLIBLIB@
 AM_CFLAGS = @CFLAGS@
-
-ha_sbin_PROGRAMS = ha_logger
-halib_PROGRAMS = ha_logd logtest
-
 ha_logd_SOURCES = ha_logd.c
 ha_logd_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la		\
 		    $(top_builddir)/lib/clplumbing/libplumbgpl.la	\
 		    $(gliblib) $(top_builddir)/lib/apphb/libapphb.la
 
-
 ha_logger_SOURCES = ha_logger.c
 ha_logger_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la  	\
                     $(gliblib)
 
-
 logtest_SOURCES = logtest.c
 logtest_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la    	\
                     $(gliblib)
 
-subdir = logd
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-ha_sbin_PROGRAMS = ha_logger$(EXEEXT)
-halib_PROGRAMS = ha_logd$(EXEEXT) logtest$(EXEEXT)
-PROGRAMS = $(ha_sbin_PROGRAMS) $(halib_PROGRAMS)
-
-am_ha_logd_OBJECTS = ha_logd.$(OBJEXT)
-ha_logd_OBJECTS = $(am_ha_logd_OBJECTS)
-ha_logd_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/clplumbing/libplumbgpl.la \
-	$(top_builddir)/lib/apphb/libapphb.la
-ha_logd_LDFLAGS =
-am_ha_logger_OBJECTS = ha_logger.$(OBJEXT)
-ha_logger_OBJECTS = $(am_ha_logger_OBJECTS)
-ha_logger_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la
-ha_logger_LDFLAGS =
-am_logtest_OBJECTS = logtest.$(OBJEXT)
-logtest_OBJECTS = $(am_logtest_OBJECTS)
-logtest_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la
-logtest_LDFLAGS =
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ha_logd.Po ./$(DEPDIR)/ha_logger.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/logtest.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(ha_logd_SOURCES) $(ha_logger_SOURCES) \
-	$(logtest_SOURCES)
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(ha_logd_SOURCES) $(ha_logger_SOURCES) $(logtest_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  logd/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  logd/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-ha_sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-ha_sbinPROGRAMS: $(ha_sbin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(ha_sbindir)
+	test -z "$(ha_sbindir)" || $(MKDIR_P) "$(DESTDIR)$(ha_sbindir)"
 	@list='$(ha_sbin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(ha_sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(ha_sbindir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(ha_sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(ha_sbindir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(ha_sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(ha_sbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(ha_sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(ha_sbindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -462,8 +442,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(ha_sbin_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(ha_sbindir)/$$f"; \
-	  rm -f $(DESTDIR)$(ha_sbindir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(ha_sbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(ha_sbindir)/$$f"; \
 	done
 
 clean-ha_sbinPROGRAMS:
@@ -472,18 +452,17 @@
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
 	done
-halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-halibPROGRAMS: $(halib_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	test -z "$(halibdir)" || $(MKDIR_P) "$(DESTDIR)$(halibdir)"
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -491,8 +470,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(halibdir)/$$f"; \
-	  rm -f $(DESTDIR)$(halibdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(halibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(halibdir)/$$f"; \
 	done
 
 clean-halibPROGRAMS:
@@ -503,16 +482,16 @@
 	done
 ha_logd$(EXEEXT): $(ha_logd_OBJECTS) $(ha_logd_DEPENDENCIES) 
 	@rm -f ha_logd$(EXEEXT)
-	$(LINK) $(ha_logd_LDFLAGS) $(ha_logd_OBJECTS) $(ha_logd_LDADD) $(LIBS)
+	$(LINK) $(ha_logd_OBJECTS) $(ha_logd_LDADD) $(LIBS)
 ha_logger$(EXEEXT): $(ha_logger_OBJECTS) $(ha_logger_DEPENDENCIES) 
 	@rm -f ha_logger$(EXEEXT)
-	$(LINK) $(ha_logger_LDFLAGS) $(ha_logger_OBJECTS) $(ha_logger_LDADD) $(LIBS)
+	$(LINK) $(ha_logger_OBJECTS) $(ha_logger_LDADD) $(LIBS)
 logtest$(EXEEXT): $(logtest_OBJECTS) $(logtest_DEPENDENCIES) 
 	@rm -f logtest$(EXEEXT)
-	$(LINK) $(logtest_LDFLAGS) $(logtest_OBJECTS) $(logtest_LDADD) $(LIBS)
+	$(LINK) $(logtest_OBJECTS) $(logtest_LDADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -522,37 +501,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logtest.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -560,18 +527,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -580,6 +535,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -591,10 +547,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -617,28 +574,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -652,9 +604,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(ha_sbindir) $(DESTDIR)$(halibdir)
+	for dir in "$(DESTDIR)$(ha_sbindir)" "$(DESTDIR)$(halibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -674,7 +627,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -689,26 +642,36 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-ha_sbinPROGRAMS install-halibPROGRAMS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -729,21 +692,25 @@
 
 ps-am:
 
-uninstall-am: uninstall-ha_sbinPROGRAMS uninstall-halibPROGRAMS \
-	uninstall-info-am
+uninstall-am: uninstall-ha_sbinPROGRAMS uninstall-halibPROGRAMS
+
+.MAKE: install-am install-exec-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-ha_sbinPROGRAMS clean-halibPROGRAMS clean-libtool ctags \
-	distclean distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-ha_sbinPROGRAMS install-halibPROGRAMS \
-	install-info install-info-am install-man install-strip \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-exec-hook install-ha_sbinPROGRAMS \
+	install-halibPROGRAMS install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-ha_sbinPROGRAMS \
-	uninstall-halibPROGRAMS uninstall-info-am
+	uninstall-halibPROGRAMS
 
 
 install-exec-hook:
--- a/lrm/Makefile.in
+++ b/lrm/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,17 +13,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +29,50 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = lrm
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +95,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +138,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +149,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +157,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +176,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +184,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +219,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +239,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +249,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +258,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +278,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +300,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +315,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 # Author: Sun Jiang Dong <sunjd@cn.ibm.com>
 # Copyright (c) 2004 International Business Machines
@@ -359,31 +343,39 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 SUBDIRS = lrmd admin test
-subdir = lrm
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-DIST_SUBDIRS = $(SUBDIRS)
 all: all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lrm/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lrm/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -391,10 +383,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -402,7 +390,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -414,15 +408,20 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -443,7 +442,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -454,14 +453,6 @@
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -470,19 +461,22 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -492,10 +486,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -518,28 +513,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -550,15 +540,19 @@
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -568,7 +562,6 @@
 all-am: Makefile
 installdirs: installdirs-recursive
 installdirs-am:
-
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -588,7 +581,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -600,25 +593,34 @@
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
+html: html-recursive
+
 info: info-recursive
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -637,26 +639,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
-	install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
-	install-recursive install-strip installcheck installcheck-am \
-	installdirs installdirs-am installdirs-recursive \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-recursive
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/lrm/admin/Makefile.in
+++ b/lrm/admin/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,61 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+halib_PROGRAMS = lrmadmin$(EXEEXT)
+subdir = lrm/admin
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(halibdir)"
+halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(halib_PROGRAMS)
+am_lrmadmin_OBJECTS = lrmadmin.$(OBJEXT)
+lrmadmin_OBJECTS = $(am_lrmadmin_OBJECTS)
+lrmadmin_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(lrmadmin_LDFLAGS) \
+	$(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(lrmadmin_SOURCES)
+DIST_SOURCES = $(lrmadmin_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +107,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +150,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +161,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +169,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +188,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +196,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +231,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +251,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +261,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +270,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +290,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +312,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +327,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # Author: Sun Jiang Dong <sunjd@cn.ibm.com>
@@ -360,67 +356,60 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
 					-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
 
-
 halibdir = $(libdir)/@HB_PKG@
 COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la $(GLIBLIB)
 LRM_DIR = lrm
-halib_PROGRAMS = lrmadmin
 lrmadmin_SOURCES = lrmadmin.c
 lrmadmin_LDFLAGS = $(COMMONLIBS)
 lrmadmin_LDADD = $(top_builddir)/lib/$(LRM_DIR)/liblrm.la
 lrmadmin_DEPENDENCIES = $(top_builddir)/lib/$(LRM_DIR)/liblrm.la
-subdir = lrm/admin
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-halib_PROGRAMS = lrmadmin$(EXEEXT)
-PROGRAMS = $(halib_PROGRAMS)
-
-am_lrmadmin_OBJECTS = lrmadmin.$(OBJEXT)
-lrmadmin_OBJECTS = $(am_lrmadmin_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/lrmadmin.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(lrmadmin_SOURCES)
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(lrmadmin_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lrm/admin/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lrm/admin/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-halibPROGRAMS: $(halib_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	test -z "$(halibdir)" || $(MKDIR_P) "$(DESTDIR)$(halibdir)"
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -428,8 +417,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(halibdir)/$$f"; \
-	  rm -f $(DESTDIR)$(halibdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(halibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(halibdir)/$$f"; \
 	done
 
 clean-halibPROGRAMS:
@@ -440,10 +429,10 @@
 	done
 lrmadmin$(EXEEXT): $(lrmadmin_OBJECTS) $(lrmadmin_DEPENDENCIES) 
 	@rm -f lrmadmin$(EXEEXT)
-	$(LINK) $(lrmadmin_LDFLAGS) $(lrmadmin_OBJECTS) $(lrmadmin_LDADD) $(LIBS)
+	$(lrmadmin_LINK) $(lrmadmin_OBJECTS) $(lrmadmin_LDADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -451,37 +440,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lrmadmin.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -489,18 +466,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -509,6 +474,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -520,10 +486,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -546,28 +513,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -581,9 +543,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	for dir in "$(DESTDIR)$(halibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -603,7 +566,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -611,30 +574,41 @@
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
-clean-am: clean-generic clean-halibPROGRAMS clean-libtool mostlyclean-am
+clean-am: clean-generic clean-halibPROGRAMS clean-libtool \
+	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-halibPROGRAMS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -655,20 +629,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-halibPROGRAMS uninstall-info-am
+uninstall-am: uninstall-halibPROGRAMS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-halibPROGRAMS clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-halibPROGRAMS install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am \
+	install-halibPROGRAMS install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-halibPROGRAMS \
-	uninstall-info-am
+	tags uninstall uninstall-am uninstall-halibPROGRAMS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/lrm/lrmd/Makefile.in
+++ b/lrm/lrmd/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,12 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +31,64 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+halib_PROGRAMS = lrmd$(EXEEXT)
+subdir = lrm/lrmd
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(halibdir)"
+halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(halib_PROGRAMS)
+am_lrmd_OBJECTS = lrmd.$(OBJEXT) audit.$(OBJEXT)
+lrmd_OBJECTS = $(am_lrmd_OBJECTS)
+lrmd_LDADD = $(LDADD)
+lrmd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(lrmd_LDFLAGS) \
+	$(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(lrmd_SOURCES)
+DIST_SOURCES = $(lrmd_SOURCES)
+HEADERS = $(noinst_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +111,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +154,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +165,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +173,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +192,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +200,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +235,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +255,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +265,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +274,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +294,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +316,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +331,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 #  Author: Sun Jiang Dong <sunjd@cn.ibm.com>
@@ -360,82 +360,66 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include  -I$(top_srcdir)/include     \
                   -I$(top_builddir)/libltdl  -I$(top_srcdir)/libltdl     \
 		  -I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha    \
 		  -I$(top_builddir)          -I$(top_srcdir)
 
-
 halibdir = $(libdir)/@HB_PKG@
-
 COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la   \
 		   $(top_builddir)/lib/apphb/libapphb.la 	\
 		   $(GLIBLIB)
 
-
-halib_PROGRAMS = lrmd
-
 lrmd_SOURCES = lrmd.c audit.c lrmd_fdecl.h lrmd.h
-
 lrmd_LDFLAGS = $(top_builddir)/lib/lrm/liblrm.la 		\
 		   $(COMMONLIBS) @LIBLTDL@			\
 		   $(top_builddir)/lib/pils/libpils.la
 
-
 noinst_HEADERS = lrmd_fdecl.h lrmd.h
-subdir = lrm/lrmd
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-halib_PROGRAMS = lrmd$(EXEEXT)
-PROGRAMS = $(halib_PROGRAMS)
-
-am_lrmd_OBJECTS = lrmd.$(OBJEXT) audit.$(OBJEXT)
-lrmd_OBJECTS = $(am_lrmd_OBJECTS)
-lrmd_LDADD = $(LDADD)
-lrmd_DEPENDENCIES =
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/audit.Po ./$(DEPDIR)/lrmd.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(lrmd_SOURCES)
-HEADERS = $(noinst_HEADERS)
-
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(lrmd_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lrm/lrmd/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lrm/lrmd/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-halibPROGRAMS: $(halib_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	test -z "$(halibdir)" || $(MKDIR_P) "$(DESTDIR)$(halibdir)"
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -443,8 +427,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(halibdir)/$$f"; \
-	  rm -f $(DESTDIR)$(halibdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(halibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(halibdir)/$$f"; \
 	done
 
 clean-halibPROGRAMS:
@@ -455,10 +439,10 @@
 	done
 lrmd$(EXEEXT): $(lrmd_OBJECTS) $(lrmd_DEPENDENCIES) 
 	@rm -f lrmd$(EXEEXT)
-	$(LINK) $(lrmd_LDFLAGS) $(lrmd_OBJECTS) $(lrmd_LDADD) $(LIBS)
+	$(lrmd_LINK) $(lrmd_OBJECTS) $(lrmd_LDADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -467,37 +451,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lrmd.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -505,18 +477,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -525,6 +485,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -536,10 +497,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -562,28 +524,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -597,9 +554,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(HEADERS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	for dir in "$(DESTDIR)$(halibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -619,7 +577,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -627,30 +585,41 @@
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
-clean-am: clean-generic clean-halibPROGRAMS clean-libtool mostlyclean-am
+clean-am: clean-generic clean-halibPROGRAMS clean-libtool \
+	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-halibPROGRAMS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -671,20 +640,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-halibPROGRAMS uninstall-info-am
+uninstall-am: uninstall-halibPROGRAMS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-halibPROGRAMS clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-halibPROGRAMS install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am \
+	install-halibPROGRAMS install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-halibPROGRAMS \
-	uninstall-info-am
+	tags uninstall uninstall-am uninstall-halibPROGRAMS
 
 
 # make lrmd's owner as hacluster:haclient?
--- a/lrm/test/Makefile.in
+++ b/lrm/test/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,13 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +32,101 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+noinst_PROGRAMS = apitest$(EXEEXT) plugintest$(EXEEXT) \
+	callbacktest$(EXEEXT)
+subdir = lrm/test
+DIST_COMMON = $(srcdir)/LRMBasicSanityCheck.in $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/lrmregtest-heartbeat.in \
+	$(srcdir)/lrmregtest-lsb.in $(srcdir)/lrmregtest.in \
+	$(srcdir)/regression.sh.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES = regression.sh LRMBasicSanityCheck lrmregtest \
+	lrmregtest-lsb lrmregtest-heartbeat
+PROGRAMS = $(noinst_PROGRAMS)
+am_apitest_OBJECTS = apitest.$(OBJEXT)
+apitest_OBJECTS = $(am_apitest_OBJECTS)
+apitest_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(apitest_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_callbacktest_OBJECTS = callbacktest.$(OBJEXT)
+callbacktest_OBJECTS = $(am_callbacktest_OBJECTS)
+callbacktest_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(callbacktest_LDFLAGS) $(LDFLAGS) -o $@
+am_plugintest_OBJECTS = plugintest.$(OBJEXT)
+plugintest_OBJECTS = $(am_plugintest_OBJECTS)
+am__DEPENDENCIES_1 =
+am__DEPENDENCIES_2 = $(top_builddir)/lib/clplumbing/libplumb.la \
+	$(am__DEPENDENCIES_1)
+plugintest_DEPENDENCIES = $(am__DEPENDENCIES_2)
+plugintest_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(plugintest_LDFLAGS) $(LDFLAGS) -o $@
+am__installdirs = "$(DESTDIR)$(testdir)" "$(DESTDIR)$(testdir)"
+testSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(test_SCRIPTS)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(apitest_SOURCES) $(callbacktest_SOURCES) \
+	$(plugintest_SOURCES)
+DIST_SOURCES = $(apitest_SOURCES) $(callbacktest_SOURCES) \
+	$(plugintest_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+testDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(test_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +149,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +192,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +203,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +211,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +230,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +238,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +273,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +293,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +303,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +312,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +332,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +354,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +369,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # Author: Sun Jiang Dong <sunjd@cn.ibm.com>
@@ -360,105 +398,70 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 SUBDIRS = testcases
-
 INCLUDES = -I$(top_builddir)/include  -I$(top_srcdir)/include \
 			-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
 
-
 COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la $(GLIBLIB)
-
 LRM_DIR = lrm
-noinst_PROGRAMS = apitest plugintest callbacktest
-
 apitest_SOURCES = apitest.c
 apitest_LDFLAGS = $(COMMONLIBS)
 apitest_LDADD = $(top_builddir)/lib/$(LRM_DIR)/liblrm.la
 apitest_DEPENDENCIES = $(top_builddir)/lib/$(LRM_DIR)/liblrm.la
-
 plugintest_SOURCES = plugintest.c
 plugintest_LDADD = $(COMMONLIBS)
 plugintest_LDFLAGS = -L$(top_builddir)/lib/pils -lpils @LIBLTDL@
-
 callbacktest_SOURCES = callbacktest.c
 callbacktest_LDFLAGS = $(COMMONLIBS)
 callbacktest_LDADD = $(top_builddir)/lib/$(LRM_DIR)/liblrm.la
 callbacktest_DEPENDENCIES = $(top_builddir)/lib/$(LRM_DIR)/liblrm.la
-
 testdir = $(HA_NOARCHDATAHBDIR)/lrmtest
 test_SCRIPTS = LRMBasicSanityCheck regression.sh evaltest.sh lrmregtest lrmregtest-heartbeat lrmregtest-lsb
 test_DATA = README.regression defaults descriptions lrmadmin-interface language
 #				shouldn't need this, but we do for some versions of autofoo tools
 EXTRA_DIST = $(test_SCRIPTS) $(test_DATA)
-subdir = lrm/test
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES = regression.sh LRMBasicSanityCheck lrmregtest \
-	lrmregtest-lsb lrmregtest-heartbeat
-noinst_PROGRAMS = apitest$(EXEEXT) plugintest$(EXEEXT) \
-	callbacktest$(EXEEXT)
-PROGRAMS = $(noinst_PROGRAMS)
-
-am_apitest_OBJECTS = apitest.$(OBJEXT)
-apitest_OBJECTS = $(am_apitest_OBJECTS)
-am_callbacktest_OBJECTS = callbacktest.$(OBJEXT)
-callbacktest_OBJECTS = $(am_callbacktest_OBJECTS)
-am_plugintest_OBJECTS = plugintest.$(OBJEXT)
-plugintest_OBJECTS = $(am_plugintest_OBJECTS)
-plugintest_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la
-SCRIPTS = $(test_SCRIPTS)
-
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/apitest.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/callbacktest.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/plugintest.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(apitest_SOURCES) $(callbacktest_SOURCES) \
-	$(plugintest_SOURCES)
-DATA = $(test_DATA)
-
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive
-DIST_COMMON = $(srcdir)/Makefile.in LRMBasicSanityCheck.in Makefile.am \
-	lrmregtest-heartbeat.in lrmregtest-lsb.in lrmregtest.in \
-	regression.sh.in
-DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(apitest_SOURCES) $(callbacktest_SOURCES) $(plugintest_SOURCES)
-
 all: all-recursive
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lrm/test/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lrm/test/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-regression.sh: $(top_builddir)/config.status regression.sh.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+regression.sh: $(top_builddir)/config.status $(srcdir)/regression.sh.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-LRMBasicSanityCheck: $(top_builddir)/config.status LRMBasicSanityCheck.in
+LRMBasicSanityCheck: $(top_builddir)/config.status $(srcdir)/LRMBasicSanityCheck.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lrmregtest: $(top_builddir)/config.status lrmregtest.in
+lrmregtest: $(top_builddir)/config.status $(srcdir)/lrmregtest.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lrmregtest-lsb: $(top_builddir)/config.status lrmregtest-lsb.in
+lrmregtest-lsb: $(top_builddir)/config.status $(srcdir)/lrmregtest-lsb.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-lrmregtest-heartbeat: $(top_builddir)/config.status lrmregtest-heartbeat.in
+lrmregtest-heartbeat: $(top_builddir)/config.status $(srcdir)/lrmregtest-heartbeat.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 clean-noinstPROGRAMS:
@@ -469,23 +472,22 @@
 	done
 apitest$(EXEEXT): $(apitest_OBJECTS) $(apitest_DEPENDENCIES) 
 	@rm -f apitest$(EXEEXT)
-	$(LINK) $(apitest_LDFLAGS) $(apitest_OBJECTS) $(apitest_LDADD) $(LIBS)
+	$(apitest_LINK) $(apitest_OBJECTS) $(apitest_LDADD) $(LIBS)
 callbacktest$(EXEEXT): $(callbacktest_OBJECTS) $(callbacktest_DEPENDENCIES) 
 	@rm -f callbacktest$(EXEEXT)
-	$(LINK) $(callbacktest_LDFLAGS) $(callbacktest_OBJECTS) $(callbacktest_LDADD) $(LIBS)
+	$(callbacktest_LINK) $(callbacktest_OBJECTS) $(callbacktest_LDADD) $(LIBS)
 plugintest$(EXEEXT): $(plugintest_OBJECTS) $(plugintest_DEPENDENCIES) 
 	@rm -f plugintest$(EXEEXT)
-	$(LINK) $(plugintest_LDFLAGS) $(plugintest_OBJECTS) $(plugintest_LDADD) $(LIBS)
-testSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+	$(plugintest_LINK) $(plugintest_OBJECTS) $(plugintest_LDADD) $(LIBS)
 install-testSCRIPTS: $(test_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(testdir)
+	test -z "$(testdir)" || $(MKDIR_P) "$(DESTDIR)$(testdir)"
 	@list='$(test_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(testSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(testdir)/$$f"; \
-	    $(testSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(testdir)/$$f; \
+	    echo " $(testSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(testdir)/$$f'"; \
+	    $(testSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(testdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -493,12 +495,12 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(test_SCRIPTS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f $(DESTDIR)$(testdir)/$$f"; \
-	  rm -f $(DESTDIR)$(testdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(testdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(testdir)/$$f"; \
 	done
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -508,64 +510,47 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugintest.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-testDATA_INSTALL = $(INSTALL_DATA)
 install-testDATA: $(test_DATA)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(testdir)
+	test -z "$(testdir)" || $(MKDIR_P) "$(DESTDIR)$(testdir)"
 	@list='$(test_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(testDATA_INSTALL) $$d$$p $(DESTDIR)$(testdir)/$$f"; \
-	  $(testDATA_INSTALL) $$d$$p $(DESTDIR)$(testdir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " $(testDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(testdir)/$$f'"; \
+	  $(testDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(testdir)/$$f"; \
 	done
 
 uninstall-testDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(test_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(testdir)/$$f"; \
-	  rm -f $(DESTDIR)$(testdir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(testdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(testdir)/$$f"; \
 	done
 
 # This directory's subdirectories are mostly independent; you can cd
@@ -575,7 +560,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -587,15 +578,20 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -616,7 +612,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -627,14 +623,6 @@
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -643,19 +631,22 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -665,10 +656,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -691,28 +683,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -723,15 +710,19 @@
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -741,8 +732,9 @@
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
-	$(mkinstalldirs) $(DESTDIR)$(testdir) $(DESTDIR)$(testdir)
-
+	for dir in "$(DESTDIR)$(testdir)" "$(DESTDIR)$(testdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -762,7 +754,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -777,24 +769,34 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
+html: html-recursive
+
 info: info-recursive
 
 info-am:
 
 install-data-am: install-testDATA install-testSCRIPTS
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -815,27 +817,25 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-testDATA uninstall-testSCRIPTS
+uninstall-am: uninstall-testDATA uninstall-testSCRIPTS
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-noinstPROGRAMS \
-	clean-recursive ctags ctags-recursive distclean \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	clean-noinstPROGRAMS ctags ctags-recursive distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
-	install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
-	install-recursive install-strip install-testDATA \
-	install-testSCRIPTS installcheck installcheck-am installdirs \
-	installdirs-am installdirs-recursive maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip install-testDATA install-testSCRIPTS \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
-	ps-recursive tags tags-recursive uninstall uninstall-am \
-	uninstall-info-am uninstall-info-recursive uninstall-recursive \
+	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
 	uninstall-testDATA uninstall-testSCRIPTS
 
 
--- a/lrm/test/testcases/Makefile.in
+++ b/lrm/test/testcases/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,12 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +31,50 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = lrm/test/testcases
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(testcasesdir)" \
+	"$(DESTDIR)$(testcasesdir)"
+testcasesSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(testcases_SCRIPTS)
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+testcasesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(testcases_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +97,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +140,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +151,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +159,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +178,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +186,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +221,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +241,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +251,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +260,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +280,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +302,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +317,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # Author: Sun Jiang Dong <sunjd@cn.ibm.com>
@@ -360,7 +346,6 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 testcasesdir = $(HA_NOARCHDATAHBDIR)/lrmtest/testcases
 testcases_SCRIPTS = common.filter ra-list.sh rscmgmt.log_filter xmllint.sh
 testcases_DATA = BSC metadata metadata.exp rscexec \
@@ -368,36 +353,47 @@
 
 #			shouldn't need this next line...
 EXTRA_DIST = $(testcases_SCRIPTS) $(testcases_DATA)
-subdir = lrm/test/testcases
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-SCRIPTS = $(testcases_SCRIPTS)
-
-DIST_SOURCES =
-DATA = $(testcases_DATA)
-
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lrm/test/testcases/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lrm/test/testcases/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-testcasesSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-testcasesSCRIPTS: $(testcases_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(testcasesdir)
+	test -z "$(testcasesdir)" || $(MKDIR_P) "$(DESTDIR)$(testcasesdir)"
 	@list='$(testcases_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(testcasesSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(testcasesdir)/$$f"; \
-	    $(testcasesSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(testcasesdir)/$$f; \
+	    echo " $(testcasesSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(testcasesdir)/$$f'"; \
+	    $(testcasesSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(testcasesdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -405,8 +401,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(testcases_SCRIPTS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f $(DESTDIR)$(testcasesdir)/$$f"; \
-	  rm -f $(DESTDIR)$(testcasesdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(testcasesdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(testcasesdir)/$$f"; \
 	done
 
 mostlyclean-libtool:
@@ -414,27 +410,22 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-testcasesDATA_INSTALL = $(INSTALL_DATA)
 install-testcasesDATA: $(testcases_DATA)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(testcasesdir)
+	test -z "$(testcasesdir)" || $(MKDIR_P) "$(DESTDIR)$(testcasesdir)"
 	@list='$(testcases_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(testcasesDATA_INSTALL) $$d$$p $(DESTDIR)$(testcasesdir)/$$f"; \
-	  $(testcasesDATA_INSTALL) $$d$$p $(DESTDIR)$(testcasesdir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " $(testcasesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(testcasesdir)/$$f'"; \
+	  $(testcasesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(testcasesdir)/$$f"; \
 	done
 
 uninstall-testcasesDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(testcases_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(testcasesdir)/$$f"; \
-	  rm -f $(DESTDIR)$(testcasesdir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(testcasesdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(testcasesdir)/$$f"; \
 	done
 tags: TAGS
 TAGS:
@@ -442,28 +433,23 @@
 ctags: CTAGS
 CTAGS:
 
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -477,9 +463,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(SCRIPTS) $(DATA)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(testcasesdir) $(DESTDIR)$(testcasesdir)
+	for dir in "$(DESTDIR)$(testcasesdir)" "$(DESTDIR)$(testcasesdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -499,7 +486,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -511,24 +498,34 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-testcasesDATA install-testcasesSCRIPTS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -547,18 +544,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-testcasesDATA \
-	uninstall-testcasesSCRIPTS
+uninstall-am: uninstall-testcasesDATA uninstall-testcasesSCRIPTS
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip install-testcasesDATA \
-	install-testcasesSCRIPTS installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am uninstall uninstall-am uninstall-info-am \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	install-testcasesDATA install-testcasesSCRIPTS installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
 	uninstall-testcasesDATA uninstall-testcasesSCRIPTS
 
 
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,8 +1,8 @@
 # ltmain.sh - Provide generalized library-building support services.
 # NOTE: Changing this file will not affect anything until you rerun configure.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007  Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
 # This program is free software; you can redistribute it and/or modify
@@ -43,8 +43,8 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.5.22
-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
+VERSION="1.5.24 Debian 1.5.24-2"
+TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
 
 # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -57,6 +57,8 @@
 else
   case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
 
 # Check that we have a working $echo.
 if test "X$1" = X--no-reexec; then
@@ -114,10 +116,10 @@
 for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
 do
   eval "if test \"\${$lt_var+set}\" = set; then
-         save_$lt_var=\$$lt_var
-         $lt_var=C
-         export $lt_var
-       fi"
+	  save_$lt_var=\$$lt_var
+	  $lt_var=C
+	  export $lt_var
+	fi"
 done
 
 # Make sure IFS has a sensible default
@@ -206,7 +208,13 @@
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
       $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
       win32_nmres=`eval $NM -f posix -A $1 | \
-	$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
+	$SED -n -e '1,100{
+		/ I /{
+			s,.*,import,
+			p
+			q
+			}
+		}'`
       case $win32_nmres in
       import*)  win32_libid_type="x86 archive import";;
       *)        win32_libid_type="x86 archive static";;
@@ -340,11 +348,11 @@
       my_xlib_u=$my_xlib
       while :; do
         case " $extracted_archives " in
-       *" $my_xlib_u "*)
-         extracted_serial=`expr $extracted_serial + 1`
-         my_xlib_u=lt$extracted_serial-$my_xlib ;;
-       *) break ;;
-       esac
+	*" $my_xlib_u "*)
+	  extracted_serial=`expr $extracted_serial + 1`
+	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
+	*) break ;;
+	esac
       done
       extracted_archives="$extracted_archives $my_xlib_u"
       my_xdir="$my_gentop/$my_xlib_u"
@@ -474,11 +482,12 @@
     ;;
 
   --version)
-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-    $echo
-    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
-    $echo "This is free software; see the source for copying conditions.  There is NO"
-    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+    echo "\
+$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
+
+Copyright (C) 2007  Free Software Foundation, Inc.
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
     exit $?
     ;;
 
@@ -775,7 +784,7 @@
     *.class) xform=class ;;
     *.cpp) xform=cpp ;;
     *.cxx) xform=cxx ;;
-    *.f90) xform=f90 ;;
+    *.[fF][09]?) xform=[fF][09]. ;;
     *.for) xform=for ;;
     *.java) xform=java ;;
     *.obj) xform=obj ;;
@@ -1160,8 +1169,8 @@
     do
       case $arg in
       -all-static | -static | -static-libtool-libs)
-    case $arg in
-    -all-static)
+	case $arg in
+	-all-static)
 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
 	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
 	  fi
@@ -1170,19 +1179,19 @@
 	  fi
 	  prefer_static_libs=yes
 	  ;;
-    -static)
+	-static)
 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=built
 	  ;;
-    -static-libtool-libs)
-      if test -z "$pic_flag" && test -n "$link_static_flag"; then
-        dlopen_self=$dlopen_self_static
-      fi
-      prefer_static_libs=yes
-      ;;
-    esac
+	-static-libtool-libs)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	esac
 	build_libtool_libs=no
 	build_old_libs=yes
 	break
@@ -1630,7 +1639,7 @@
 	continue
 	;;
 
-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 	compiler_flags="$compiler_flags $arg"
 	compile_command="$compile_command $arg"
 	finalize_command="$finalize_command $arg"
@@ -1650,10 +1659,11 @@
       # -m* pass through architecture-specific compiler args for GCC
       # -m*, -t[45]*, -txscale* pass through architecture-specific
       # compiler args for GCC
-      # -pg pass through profiling flag for GCC
+      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+      # -F/path gives path to uninstalled frameworks, gcc on darwin
       # @file GCC response files
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-      -t[45]*|-txscale*|@*)
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
 
 	# Unknown arguments in both finalize_command and compile_command need
 	# to be aesthetically quoted because they are evaled later.
@@ -1681,9 +1691,9 @@
 
       -no-install)
 	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
 	  # The PATH hackery in wrapper scripts is required on Windows
-	  # in order for the loader to find any dlls it needs.
+	  # and Darwin in order for the loader to find any dlls it needs.
 	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
 	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
 	  fast_install=no
@@ -2112,7 +2122,10 @@
 	case $pass in
 	dlopen) libs="$dlfiles" ;;
 	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+	link)
+	  libs="$deplibs %DEPLIBS%"
+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+	  ;;
 	esac
       fi
       if test "$pass" = dlopen; then
@@ -2124,7 +2137,7 @@
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -2520,9 +2533,9 @@
 
 	if test "$linkmode,$pass" = "prog,link"; then
 	  if test -n "$library_names" &&
-         { { test "$prefer_static_libs" = no ||
-             test "$prefer_static_libs,$installed" = "built,yes"; } ||
-           test -z "$old_library"; }; then
+	     { { test "$prefer_static_libs" = no ||
+		 test "$prefer_static_libs,$installed" = "built,yes"; } ||
+	       test -z "$old_library"; }; then
 	    # We need to hardcode the library path
 	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 	      # Make sure the rpath contains only unique directories.
@@ -3229,9 +3242,15 @@
 	    age="0"
 	    ;;
 	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor - 1`
+	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_minor"
+	    lt_irix_increment=no
+	    ;;
+	  *)
+	    $echo "$modename: unknown library version type \`$version_type'" 1>&2
+	    $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+	    exit $EXIT_FAILURE
 	    ;;
 	  esac
 	  ;;
@@ -3290,7 +3309,8 @@
 	  versuffix="$major.$age.$revision"
 	  # Darwin ld doesn't like 0 for these options...
 	  minor_current=`expr $current + 1`
-	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
 	  ;;
 
 	freebsd-aout)
@@ -3304,8 +3324,11 @@
 	  ;;
 
 	irix | nonstopux)
-	  major=`expr $current - $age + 1`
-
+	  if test "X$lt_irix_increment" = "Xno"; then
+	    major=`expr $current - $age`
+	  else
+	    major=`expr $current - $age + 1`
+	  fi
 	  case $version_type in
 	    nonstopux) verstring_prefix=nonstopux ;;
 	    *)         verstring_prefix=sgi ;;
@@ -3442,11 +3465,11 @@
       fi
 
       # Eliminate all temporary directories.
-#      for path in $notinst_path; do
-#	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-#	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-#	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-#      done
+      #for path in $notinst_path; do
+      #	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+      #	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+      #	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+      #done
 
       if test -n "$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -3547,7 +3570,7 @@
 	  int main() { return 0; }
 EOF
 	  $rm conftest
-      if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
 	    ldd_output=`ldd conftest`
 	    for i in $deplibs; do
 	      name=`expr $i : '-l\(.*\)'`
@@ -3909,7 +3932,10 @@
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
 	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+	      case $archive_cmds in
+	      *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
+	      *)      eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
+	      esac
 	    else
 	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
 	    fi
@@ -4275,7 +4301,7 @@
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
 	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-      reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+	  reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
 	else
 	  gentop="$output_objdir/${obj}x"
 	  generated="$generated $gentop"
@@ -5295,6 +5321,8 @@
 else
   case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
 fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
@@ -6391,8 +6419,10 @@
 	if test -f "$dir/$objdir/$dlname"; then
 	  dir="$dir/$objdir"
 	else
-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	  exit $EXIT_FAILURE
+	  if test ! -f "$dir/$dlname"; then
+	    $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
 	fi
 	;;
 
@@ -6458,12 +6488,11 @@
       # Restore saved environment variables
       for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
       do
-       eval "if test \"\${save_$lt_var+set}\" = set; then
-               $lt_var=\$save_$lt_var; export $lt_var
-             fi"
+	eval "if test \"\${save_$lt_var+set}\" = set; then
+		$lt_var=\$save_$lt_var; export $lt_var
+	      fi"
       done
 
-
       # Now prepare to actually exec the command.
       exec_cmd="\$cmd$args"
     else
--- a/membership/Makefile.in
+++ b/membership/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,17 +13,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +29,50 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = membership
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = ccm quorumd
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +95,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +138,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +149,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +157,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +176,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +184,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +219,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +239,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +249,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +258,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +278,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +300,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +315,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # heartbeat library directory: Linux-HA code
@@ -361,33 +345,40 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 @QUORUMD_BUILD_TRUE@QUORUMD_DIR = quorumd
-
 SUBDIRS = ccm $(QUORUMD_DIR)
-subdir = membership
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-DIST_SUBDIRS = ccm quorumd
 all: all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  membership/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  membership/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -395,10 +386,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -406,7 +393,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -418,15 +411,20 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -447,7 +445,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -458,14 +456,6 @@
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -474,19 +464,22 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -496,10 +489,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -522,28 +516,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -556,13 +545,17 @@
 	done
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -572,7 +565,6 @@
 all-am: Makefile
 installdirs: installdirs-recursive
 installdirs-am:
-
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -592,7 +584,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -604,25 +596,34 @@
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
+html: html-recursive
+
 info: info-recursive
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -641,26 +642,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
-	install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
-	install-recursive install-strip installcheck installcheck-am \
-	installdirs installdirs-am installdirs-recursive \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-recursive
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/membership/ccm/Makefile.in
+++ b/membership/ccm/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,13 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +32,105 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+ccmlib_PROGRAMS = ccm$(EXEEXT) ccm_testclient$(EXEEXT)
+libclm_PROGRAMS = clmtest$(EXEEXT)
+subdir = membership/ccm
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(ccmlibdir)" \
+	"$(DESTDIR)$(libclmdir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+libccmclient_la_LIBADD =
+am_libccmclient_la_OBJECTS = ccmlib_memapi.lo ccmlib_eventapi.lo
+libccmclient_la_OBJECTS = $(am_libccmclient_la_OBJECTS)
+libccmclient_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libccmclient_la_LDFLAGS) $(LDFLAGS) -o $@
+libclm_la_LIBADD =
+am_libclm_la_OBJECTS = libclm_la-ccmlib_clm.lo
+libclm_la_OBJECTS = $(am_libclm_la_OBJECTS)
+libclm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libclm_la_CFLAGS) \
+	$(CFLAGS) $(libclm_la_LDFLAGS) $(LDFLAGS) -o $@
+ccmlibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+libclmPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(ccmlib_PROGRAMS) $(libclm_PROGRAMS)
+am_ccm_OBJECTS = ccm.$(OBJEXT) ccmmisc.$(OBJEXT) ccmgraph.$(OBJEXT) \
+	ccmversion.$(OBJEXT) ccmupdate.$(OBJEXT) ccmllm.$(OBJEXT) \
+	ccmbitmap.$(OBJEXT) ccmmain.$(OBJEXT) ccmclient.$(OBJEXT) \
+	ccmmsg.$(OBJEXT) ccm_statemachine.$(OBJEXT) ccmmem.$(OBJEXT)
+ccm_OBJECTS = $(am_ccm_OBJECTS)
+am__DEPENDENCIES_1 =
+ccm_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
+	$(top_builddir)/lib/hbclient/libhbclient.la \
+	$(am__DEPENDENCIES_1) $(top_builddir)/lib/pils/libpils.la
+ccm_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(ccm_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_ccm_testclient_OBJECTS = ccm_testclient.$(OBJEXT)
+ccm_testclient_OBJECTS = $(am_ccm_testclient_OBJECTS)
+ccm_testclient_DEPENDENCIES = libccmclient.la \
+	$(top_builddir)/lib/clplumbing/libplumb.la \
+	$(am__DEPENDENCIES_1) $(top_builddir)/lib/pils/libpils.la
+am_clmtest_OBJECTS = clmtest.$(OBJEXT)
+clmtest_OBJECTS = $(am_clmtest_OBJECTS)
+clmtest_DEPENDENCIES = libclm.la libccmclient.la \
+	$(top_builddir)/lib/clplumbing/libplumb.la \
+	$(am__DEPENDENCIES_1) $(top_builddir)/lib/pils/libpils.la
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libccmclient_la_SOURCES) $(libclm_la_SOURCES) \
+	$(ccm_SOURCES) $(ccm_testclient_SOURCES) $(clmtest_SOURCES)
+DIST_SOURCES = $(libccmclient_la_SOURCES) $(libclm_la_SOURCES) \
+	$(ccm_SOURCES) $(ccm_testclient_SOURCES) $(clmtest_SOURCES)
+HEADERS = $(noinst_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +153,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +196,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +207,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +215,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +234,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +242,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +277,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +297,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +307,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +316,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +336,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +358,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +373,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # heartbeat: Linux-HA heartbeat code
@@ -361,7 +403,6 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
 			-I$(top_builddir)/stonith -I$(top_srcdir)/stonith \
 			-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
@@ -369,27 +410,19 @@
                         -I$(top_builddir)/include/clplumbing \
 			-I$(top_srcdir)/include/clplumbing
 
-
 hadir = $(sysconfdir)/ha.d
 halibdir = $(libdir)/@HB_PKG@
 ccmlibdir = $(halibdir)
 commmoddir = $(halibdir)/modules/comm
 havarlibdir = $(localstatedir)/lib/@HB_PKG@
 havarrundir = $(localstatedir)/run/
-
 ccmdir = $(HA_VARRUNDIR)/$(HB_PKG)/ccm
 apigid = @HA_APIGID@
 ccmuid = @HA_CCMUID@
 gliblib = @GLIBLIB@
-
 AM_CFLAGS = @CFLAGS@
-
 noinst_HEADERS = ccm.h ccmlib.h
-
 lib_LTLIBRARIES = libccmclient.la libclm.la
-
-ccmlib_PROGRAMS = ccm ccm_testclient
-
 ccm_SOURCES = ccm.c \
 		  ccmmisc.c \
 		  ccmgraph.c \
@@ -406,161 +439,105 @@
 		  ccmmisc.h 	\
 		  ccmmem.c
 
-
 ccm_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la	\
 		$(top_builddir)/lib/hbclient/libhbclient.la  	\
 		$(gliblib) \
 		  $(top_builddir)/lib/pils/libpils.la
 
-
 ccm_LDFLAGS = 
-
 ccm_testclient_SOURCES = ccm_testclient.c
 ccm_testclient_LDADD = libccmclient.la \
 			  $(top_builddir)/lib/clplumbing/libplumb.la \
 			  $(gliblib) \
 			  $(top_builddir)/lib/pils/libpils.la
 
-
 libccmclient_la_SOURCES = ccmlib_memapi.c ccmlib_eventapi.c ccmlib.h
 libccmclient_la_LDFLAGS = -version-info 1:0:0
-
 libclmdir = $(libdir)/@HB_PKG@
-
-libclm_PROGRAMS = clmtest
-
 libclm_la_SOURCES = ccmlib_clm.c
-
 libclm_la_CFLAGS = -g #-DPOSIX_THREADS
 libclm_la_LDFLAGS = -version-info 1:0:0
-
 clmtest_SOURCES = clmtest.c
 clmtest_LDADD = libclm.la libccmclient.la \
 			  $(top_builddir)/lib/clplumbing/libplumb.la \
 			  $(gliblib)\
 			  $(top_builddir)/lib/pils/libpils.la
 
-subdir = membership/ccm
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(lib_LTLIBRARIES)
-
-libccmclient_la_LIBADD =
-am_libccmclient_la_OBJECTS = ccmlib_memapi.lo ccmlib_eventapi.lo
-libccmclient_la_OBJECTS = $(am_libccmclient_la_OBJECTS)
-libclm_la_LIBADD =
-am_libclm_la_OBJECTS = libclm_la-ccmlib_clm.lo
-libclm_la_OBJECTS = $(am_libclm_la_OBJECTS)
-ccmlib_PROGRAMS = ccm$(EXEEXT) ccm_testclient$(EXEEXT)
-libclm_PROGRAMS = clmtest$(EXEEXT)
-PROGRAMS = $(ccmlib_PROGRAMS) $(libclm_PROGRAMS)
-
-am_ccm_OBJECTS = ccm.$(OBJEXT) ccmmisc.$(OBJEXT) ccmgraph.$(OBJEXT) \
-	ccmversion.$(OBJEXT) ccmupdate.$(OBJEXT) ccmllm.$(OBJEXT) \
-	ccmbitmap.$(OBJEXT) ccmmain.$(OBJEXT) ccmclient.$(OBJEXT) \
-	ccmmsg.$(OBJEXT) ccm_statemachine.$(OBJEXT) ccmmem.$(OBJEXT)
-ccm_OBJECTS = $(am_ccm_OBJECTS)
-ccm_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/hbclient/libhbclient.la \
-	$(top_builddir)/lib/pils/libpils.la
-am_ccm_testclient_OBJECTS = ccm_testclient.$(OBJEXT)
-ccm_testclient_OBJECTS = $(am_ccm_testclient_OBJECTS)
-ccm_testclient_DEPENDENCIES = libccmclient.la \
-	$(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/pils/libpils.la
-ccm_testclient_LDFLAGS =
-am_clmtest_OBJECTS = clmtest.$(OBJEXT)
-clmtest_OBJECTS = $(am_clmtest_OBJECTS)
-clmtest_DEPENDENCIES = libclm.la libccmclient.la \
-	$(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/pils/libpils.la
-clmtest_LDFLAGS =
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ccm.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/ccm_statemachine.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/ccm_testclient.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/ccmbitmap.Po ./$(DEPDIR)/ccmclient.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/ccmgraph.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/ccmlib_eventapi.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/ccmlib_memapi.Plo ./$(DEPDIR)/ccmllm.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/ccmmain.Po ./$(DEPDIR)/ccmmem.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/ccmmisc.Po ./$(DEPDIR)/ccmmsg.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/ccmupdate.Po ./$(DEPDIR)/ccmversion.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/clmtest.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/libclm_la-ccmlib_clm.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libccmclient_la_SOURCES) $(libclm_la_SOURCES) \
-	$(ccm_SOURCES) $(ccm_testclient_SOURCES) $(clmtest_SOURCES)
-HEADERS = $(noinst_HEADERS)
-
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(libccmclient_la_SOURCES) $(libclm_la_SOURCES) $(ccm_SOURCES) $(ccm_testclient_SOURCES) $(clmtest_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  membership/ccm/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  membership/ccm/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-libLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libccmclient.la: $(libccmclient_la_OBJECTS) $(libccmclient_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libccmclient_la_LDFLAGS) $(libccmclient_la_OBJECTS) $(libccmclient_la_LIBADD) $(LIBS)
+	$(libccmclient_la_LINK) -rpath $(libdir) $(libccmclient_la_OBJECTS) $(libccmclient_la_LIBADD) $(LIBS)
 libclm.la: $(libclm_la_OBJECTS) $(libclm_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libclm_la_LDFLAGS) $(libclm_la_OBJECTS) $(libclm_la_LIBADD) $(LIBS)
-ccmlibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+	$(libclm_la_LINK) -rpath $(libdir) $(libclm_la_OBJECTS) $(libclm_la_LIBADD) $(LIBS)
 install-ccmlibPROGRAMS: $(ccmlib_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(ccmlibdir)
+	test -z "$(ccmlibdir)" || $(MKDIR_P) "$(DESTDIR)$(ccmlibdir)"
 	@list='$(ccmlib_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(ccmlibPROGRAMS_INSTALL) $$p $(DESTDIR)$(ccmlibdir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(ccmlibPROGRAMS_INSTALL) $$p $(DESTDIR)$(ccmlibdir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(ccmlibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(ccmlibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(ccmlibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(ccmlibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -568,8 +545,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(ccmlib_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(ccmlibdir)/$$f"; \
-	  rm -f $(DESTDIR)$(ccmlibdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(ccmlibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(ccmlibdir)/$$f"; \
 	done
 
 clean-ccmlibPROGRAMS:
@@ -578,18 +555,17 @@
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
 	done
-libclmPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-libclmPROGRAMS: $(libclm_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(libclmdir)
+	test -z "$(libclmdir)" || $(MKDIR_P) "$(DESTDIR)$(libclmdir)"
 	@list='$(libclm_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libclmPROGRAMS_INSTALL) $$p $(DESTDIR)$(libclmdir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libclmPROGRAMS_INSTALL) $$p $(DESTDIR)$(libclmdir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libclmPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libclmdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libclmPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libclmdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -597,8 +573,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(libclm_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(libclmdir)/$$f"; \
-	  rm -f $(DESTDIR)$(libclmdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(libclmdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(libclmdir)/$$f"; \
 	done
 
 clean-libclmPROGRAMS:
@@ -609,16 +585,16 @@
 	done
 ccm$(EXEEXT): $(ccm_OBJECTS) $(ccm_DEPENDENCIES) 
 	@rm -f ccm$(EXEEXT)
-	$(LINK) $(ccm_LDFLAGS) $(ccm_OBJECTS) $(ccm_LDADD) $(LIBS)
+	$(ccm_LINK) $(ccm_OBJECTS) $(ccm_LDADD) $(LIBS)
 ccm_testclient$(EXEEXT): $(ccm_testclient_OBJECTS) $(ccm_testclient_DEPENDENCIES) 
 	@rm -f ccm_testclient$(EXEEXT)
-	$(LINK) $(ccm_testclient_LDFLAGS) $(ccm_testclient_OBJECTS) $(ccm_testclient_LDADD) $(LIBS)
+	$(LINK) $(ccm_testclient_OBJECTS) $(ccm_testclient_LDADD) $(LIBS)
 clmtest$(EXEEXT): $(clmtest_OBJECTS) $(clmtest_DEPENDENCIES) 
 	@rm -f clmtest$(EXEEXT)
-	$(LINK) $(clmtest_LDFLAGS) $(clmtest_OBJECTS) $(clmtest_LDADD) $(LIBS)
+	$(LINK) $(clmtest_OBJECTS) $(clmtest_LDADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -642,70 +618,32 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclm_la-ccmlib_clm.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-libclm_la-ccmlib_clm.o: ccmlib_clm.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclm_la_CFLAGS) $(CFLAGS) -MT libclm_la-ccmlib_clm.o -MD -MP -MF "$(DEPDIR)/libclm_la-ccmlib_clm.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libclm_la-ccmlib_clm.o `test -f 'ccmlib_clm.c' || echo '$(srcdir)/'`ccmlib_clm.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libclm_la-ccmlib_clm.Tpo" "$(DEPDIR)/libclm_la-ccmlib_clm.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libclm_la-ccmlib_clm.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ccmlib_clm.c' object='libclm_la-ccmlib_clm.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libclm_la-ccmlib_clm.Po' tmpdepfile='$(DEPDIR)/libclm_la-ccmlib_clm.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclm_la_CFLAGS) $(CFLAGS) -c -o libclm_la-ccmlib_clm.o `test -f 'ccmlib_clm.c' || echo '$(srcdir)/'`ccmlib_clm.c
-
-libclm_la-ccmlib_clm.obj: ccmlib_clm.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclm_la_CFLAGS) $(CFLAGS) -MT libclm_la-ccmlib_clm.obj -MD -MP -MF "$(DEPDIR)/libclm_la-ccmlib_clm.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libclm_la-ccmlib_clm.obj `if test -f 'ccmlib_clm.c'; then $(CYGPATH_W) 'ccmlib_clm.c'; else $(CYGPATH_W) '$(srcdir)/ccmlib_clm.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libclm_la-ccmlib_clm.Tpo" "$(DEPDIR)/libclm_la-ccmlib_clm.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libclm_la-ccmlib_clm.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ccmlib_clm.c' object='libclm_la-ccmlib_clm.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libclm_la-ccmlib_clm.Po' tmpdepfile='$(DEPDIR)/libclm_la-ccmlib_clm.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclm_la_CFLAGS) $(CFLAGS) -c -o libclm_la-ccmlib_clm.obj `if test -f 'ccmlib_clm.c'; then $(CYGPATH_W) 'ccmlib_clm.c'; else $(CYGPATH_W) '$(srcdir)/ccmlib_clm.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 libclm_la-ccmlib_clm.lo: ccmlib_clm.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclm_la_CFLAGS) $(CFLAGS) -MT libclm_la-ccmlib_clm.lo -MD -MP -MF "$(DEPDIR)/libclm_la-ccmlib_clm.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libclm_la-ccmlib_clm.lo `test -f 'ccmlib_clm.c' || echo '$(srcdir)/'`ccmlib_clm.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libclm_la-ccmlib_clm.Tpo" "$(DEPDIR)/libclm_la-ccmlib_clm.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libclm_la-ccmlib_clm.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclm_la_CFLAGS) $(CFLAGS) -MT libclm_la-ccmlib_clm.lo -MD -MP -MF $(DEPDIR)/libclm_la-ccmlib_clm.Tpo -c -o libclm_la-ccmlib_clm.lo `test -f 'ccmlib_clm.c' || echo '$(srcdir)/'`ccmlib_clm.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libclm_la-ccmlib_clm.Tpo $(DEPDIR)/libclm_la-ccmlib_clm.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ccmlib_clm.c' object='libclm_la-ccmlib_clm.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libclm_la-ccmlib_clm.Plo' tmpdepfile='$(DEPDIR)/libclm_la-ccmlib_clm.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclm_la_CFLAGS) $(CFLAGS) -c -o libclm_la-ccmlib_clm.lo `test -f 'ccmlib_clm.c' || echo '$(srcdir)/'`ccmlib_clm.c
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclm_la_CFLAGS) $(CFLAGS) -c -o libclm_la-ccmlib_clm.lo `test -f 'ccmlib_clm.c' || echo '$(srcdir)/'`ccmlib_clm.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -713,18 +651,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -733,6 +659,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -744,10 +671,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -770,28 +698,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -805,9 +728,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(ccmlibdir) $(DESTDIR)$(libclmdir)
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(ccmlibdir)" "$(DESTDIR)$(libclmdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -827,7 +751,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -842,24 +766,34 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-ccmlibPROGRAMS install-libclmPROGRAMS
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-exec-local install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -880,25 +814,28 @@
 
 ps-am:
 
-uninstall-am: uninstall-ccmlibPROGRAMS uninstall-info-am \
-	uninstall-libLTLIBRARIES uninstall-libclmPROGRAMS \
-	uninstall-local
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-ccmlibPROGRAMS \
-	clean-generic clean-libLTLIBRARIES clean-libclmPROGRAMS \
-	clean-libtool ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am info info-am install install-am install-ccmlibPROGRAMS \
-	install-data install-data-am install-exec install-exec-am \
-	install-exec-local install-info install-info-am \
+uninstall-am: uninstall-ccmlibPROGRAMS uninstall-libLTLIBRARIES \
+	uninstall-libclmPROGRAMS uninstall-local
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean \
+	clean-ccmlibPROGRAMS clean-generic clean-libLTLIBRARIES \
+	clean-libclmPROGRAMS clean-libtool ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-ccmlibPROGRAMS install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-exec-local install-html \
+	install-html-am install-info install-info-am \
 	install-libLTLIBRARIES install-libclmPROGRAMS install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
-	pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-ccmlibPROGRAMS uninstall-info-am \
-	uninstall-libLTLIBRARIES uninstall-libclmPROGRAMS \
-	uninstall-local
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-ccmlibPROGRAMS uninstall-libLTLIBRARIES \
+	uninstall-libclmPROGRAMS uninstall-local
 
 
 # additional installations not covered normally
--- a/membership/quorumd/Makefile.in
+++ b/membership/quorumd/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,71 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+halib_PROGRAMS = quorumd$(EXEEXT) quorumdtest$(EXEEXT)
+subdir = membership/quorumd
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(halibdir)"
+halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(halib_PROGRAMS)
+am_quorumd_OBJECTS = quorumd-quorumd.$(OBJEXT)
+quorumd_OBJECTS = $(am_quorumd_OBJECTS)
+am__DEPENDENCIES_1 =
+am__DEPENDENCIES_2 = $(top_builddir)/lib/clplumbing/libplumb.la \
+	$(am__DEPENDENCIES_1)
+quorumd_DEPENDENCIES = $(am__DEPENDENCIES_2)
+quorumd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(quorumd_CFLAGS) $(CFLAGS) \
+	$(quorumd_LDFLAGS) $(LDFLAGS) -o $@
+am_quorumdtest_OBJECTS = quorumdtest-quorumdtest.$(OBJEXT)
+quorumdtest_OBJECTS = $(am_quorumdtest_OBJECTS)
+quorumdtest_DEPENDENCIES = $(am__DEPENDENCIES_2)
+quorumdtest_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(quorumdtest_CFLAGS) \
+	$(CFLAGS) $(quorumdtest_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(quorumd_SOURCES) $(quorumdtest_SOURCES)
+DIST_SOURCES = $(quorumd_SOURCES) $(quorumdtest_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +117,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +160,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +171,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +179,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +198,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +206,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +241,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +261,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +271,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +280,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +300,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +322,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +337,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 #  Author: Huang Zhen <zhenhltc@cn.ibm.com>
@@ -360,82 +366,67 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include  -I$(top_srcdir)/include     \
                   -I$(top_builddir)/libltdl  -I$(top_srcdir)/libltdl     \
 		  -I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha    \
 		  -I$(top_builddir)          -I$(top_srcdir)
 
-
 COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la   \
 		   $(GLIBLIB)
 
-
 halibdir = $(libdir)/@HB_PKG@
-
-halib_PROGRAMS = quorumd quorumdtest
 quorumd_SOURCES = quorumd.c
 quorumd_LDADD = $(COMMONLIBS)
 quorumd_LDFLAGS = $(GNUTLSLIBS)
 quorumd_CFLAGS = $(INCLUDES) $(GNUTLSHEAD)
-
 quorumdtest_SOURCES = quorumdtest.c
 quorumdtest_LDADD = $(COMMONLIBS)
 quorumdtest_LDFLAGS = $(GNUTLSLIBS)
 quorumdtest_CFLAGS = $(INCLUDES) $(GNUTLSHEAD)
-subdir = membership/quorumd
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-halib_PROGRAMS = quorumd$(EXEEXT) quorumdtest$(EXEEXT)
-PROGRAMS = $(halib_PROGRAMS)
-
-am_quorumd_OBJECTS = quorumd-quorumd.$(OBJEXT)
-quorumd_OBJECTS = $(am_quorumd_OBJECTS)
-quorumd_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la
-am_quorumdtest_OBJECTS = quorumdtest-quorumdtest.$(OBJEXT)
-quorumdtest_OBJECTS = $(am_quorumdtest_OBJECTS)
-quorumdtest_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/quorumd-quorumd.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/quorumdtest-quorumdtest.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(quorumd_SOURCES) $(quorumdtest_SOURCES)
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(quorumd_SOURCES) $(quorumdtest_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  membership/quorumd/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  membership/quorumd/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-halibPROGRAMS: $(halib_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	test -z "$(halibdir)" || $(MKDIR_P) "$(DESTDIR)$(halibdir)"
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -443,8 +434,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(halibdir)/$$f"; \
-	  rm -f $(DESTDIR)$(halibdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(halibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(halibdir)/$$f"; \
 	done
 
 clean-halibPROGRAMS:
@@ -455,13 +446,13 @@
 	done
 quorumd$(EXEEXT): $(quorumd_OBJECTS) $(quorumd_DEPENDENCIES) 
 	@rm -f quorumd$(EXEEXT)
-	$(LINK) $(quorumd_LDFLAGS) $(quorumd_OBJECTS) $(quorumd_LDADD) $(LIBS)
+	$(quorumd_LINK) $(quorumd_OBJECTS) $(quorumd_LDADD) $(LIBS)
 quorumdtest$(EXEEXT): $(quorumdtest_OBJECTS) $(quorumdtest_DEPENDENCIES) 
 	@rm -f quorumdtest$(EXEEXT)
-	$(LINK) $(quorumdtest_LDFLAGS) $(quorumdtest_OBJECTS) $(quorumdtest_LDADD) $(LIBS)
+	$(quorumdtest_LINK) $(quorumdtest_OBJECTS) $(quorumdtest_LDADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -470,122 +461,60 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quorumdtest-quorumdtest.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 quorumd-quorumd.o: quorumd.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(quorumd_CFLAGS) $(CFLAGS) -MT quorumd-quorumd.o -MD -MP -MF "$(DEPDIR)/quorumd-quorumd.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o quorumd-quorumd.o `test -f 'quorumd.c' || echo '$(srcdir)/'`quorumd.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/quorumd-quorumd.Tpo" "$(DEPDIR)/quorumd-quorumd.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/quorumd-quorumd.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(quorumd_CFLAGS) $(CFLAGS) -MT quorumd-quorumd.o -MD -MP -MF $(DEPDIR)/quorumd-quorumd.Tpo -c -o quorumd-quorumd.o `test -f 'quorumd.c' || echo '$(srcdir)/'`quorumd.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/quorumd-quorumd.Tpo $(DEPDIR)/quorumd-quorumd.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='quorumd.c' object='quorumd-quorumd.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/quorumd-quorumd.Po' tmpdepfile='$(DEPDIR)/quorumd-quorumd.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(quorumd_CFLAGS) $(CFLAGS) -c -o quorumd-quorumd.o `test -f 'quorumd.c' || echo '$(srcdir)/'`quorumd.c
 
 quorumd-quorumd.obj: quorumd.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(quorumd_CFLAGS) $(CFLAGS) -MT quorumd-quorumd.obj -MD -MP -MF "$(DEPDIR)/quorumd-quorumd.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o quorumd-quorumd.obj `if test -f 'quorumd.c'; then $(CYGPATH_W) 'quorumd.c'; else $(CYGPATH_W) '$(srcdir)/quorumd.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/quorumd-quorumd.Tpo" "$(DEPDIR)/quorumd-quorumd.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/quorumd-quorumd.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(quorumd_CFLAGS) $(CFLAGS) -MT quorumd-quorumd.obj -MD -MP -MF $(DEPDIR)/quorumd-quorumd.Tpo -c -o quorumd-quorumd.obj `if test -f 'quorumd.c'; then $(CYGPATH_W) 'quorumd.c'; else $(CYGPATH_W) '$(srcdir)/quorumd.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/quorumd-quorumd.Tpo $(DEPDIR)/quorumd-quorumd.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='quorumd.c' object='quorumd-quorumd.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/quorumd-quorumd.Po' tmpdepfile='$(DEPDIR)/quorumd-quorumd.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(quorumd_CFLAGS) $(CFLAGS) -c -o quorumd-quorumd.obj `if test -f 'quorumd.c'; then $(CYGPATH_W) 'quorumd.c'; else $(CYGPATH_W) '$(srcdir)/quorumd.c'; fi`
 
-quorumd-quorumd.lo: quorumd.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(quorumd_CFLAGS) $(CFLAGS) -MT quorumd-quorumd.lo -MD -MP -MF "$(DEPDIR)/quorumd-quorumd.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o quorumd-quorumd.lo `test -f 'quorumd.c' || echo '$(srcdir)/'`quorumd.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/quorumd-quorumd.Tpo" "$(DEPDIR)/quorumd-quorumd.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/quorumd-quorumd.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='quorumd.c' object='quorumd-quorumd.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/quorumd-quorumd.Plo' tmpdepfile='$(DEPDIR)/quorumd-quorumd.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(quorumd_CFLAGS) $(CFLAGS) -c -o quorumd-quorumd.lo `test -f 'quorumd.c' || echo '$(srcdir)/'`quorumd.c
-
 quorumdtest-quorumdtest.o: quorumdtest.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(quorumdtest_CFLAGS) $(CFLAGS) -MT quorumdtest-quorumdtest.o -MD -MP -MF "$(DEPDIR)/quorumdtest-quorumdtest.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o quorumdtest-quorumdtest.o `test -f 'quorumdtest.c' || echo '$(srcdir)/'`quorumdtest.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/quorumdtest-quorumdtest.Tpo" "$(DEPDIR)/quorumdtest-quorumdtest.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/quorumdtest-quorumdtest.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(quorumdtest_CFLAGS) $(CFLAGS) -MT quorumdtest-quorumdtest.o -MD -MP -MF $(DEPDIR)/quorumdtest-quorumdtest.Tpo -c -o quorumdtest-quorumdtest.o `test -f 'quorumdtest.c' || echo '$(srcdir)/'`quorumdtest.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/quorumdtest-quorumdtest.Tpo $(DEPDIR)/quorumdtest-quorumdtest.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='quorumdtest.c' object='quorumdtest-quorumdtest.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/quorumdtest-quorumdtest.Po' tmpdepfile='$(DEPDIR)/quorumdtest-quorumdtest.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(quorumdtest_CFLAGS) $(CFLAGS) -c -o quorumdtest-quorumdtest.o `test -f 'quorumdtest.c' || echo '$(srcdir)/'`quorumdtest.c
 
 quorumdtest-quorumdtest.obj: quorumdtest.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(quorumdtest_CFLAGS) $(CFLAGS) -MT quorumdtest-quorumdtest.obj -MD -MP -MF "$(DEPDIR)/quorumdtest-quorumdtest.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o quorumdtest-quorumdtest.obj `if test -f 'quorumdtest.c'; then $(CYGPATH_W) 'quorumdtest.c'; else $(CYGPATH_W) '$(srcdir)/quorumdtest.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/quorumdtest-quorumdtest.Tpo" "$(DEPDIR)/quorumdtest-quorumdtest.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/quorumdtest-quorumdtest.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(quorumdtest_CFLAGS) $(CFLAGS) -MT quorumdtest-quorumdtest.obj -MD -MP -MF $(DEPDIR)/quorumdtest-quorumdtest.Tpo -c -o quorumdtest-quorumdtest.obj `if test -f 'quorumdtest.c'; then $(CYGPATH_W) 'quorumdtest.c'; else $(CYGPATH_W) '$(srcdir)/quorumdtest.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/quorumdtest-quorumdtest.Tpo $(DEPDIR)/quorumdtest-quorumdtest.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='quorumdtest.c' object='quorumdtest-quorumdtest.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/quorumdtest-quorumdtest.Po' tmpdepfile='$(DEPDIR)/quorumdtest-quorumdtest.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(quorumdtest_CFLAGS) $(CFLAGS) -c -o quorumdtest-quorumdtest.obj `if test -f 'quorumdtest.c'; then $(CYGPATH_W) 'quorumdtest.c'; else $(CYGPATH_W) '$(srcdir)/quorumdtest.c'; fi`
 
-quorumdtest-quorumdtest.lo: quorumdtest.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(quorumdtest_CFLAGS) $(CFLAGS) -MT quorumdtest-quorumdtest.lo -MD -MP -MF "$(DEPDIR)/quorumdtest-quorumdtest.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o quorumdtest-quorumdtest.lo `test -f 'quorumdtest.c' || echo '$(srcdir)/'`quorumdtest.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/quorumdtest-quorumdtest.Tpo" "$(DEPDIR)/quorumdtest-quorumdtest.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/quorumdtest-quorumdtest.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='quorumdtest.c' object='quorumdtest-quorumdtest.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/quorumdtest-quorumdtest.Plo' tmpdepfile='$(DEPDIR)/quorumdtest-quorumdtest.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(quorumdtest_CFLAGS) $(CFLAGS) -c -o quorumdtest-quorumdtest.lo `test -f 'quorumdtest.c' || echo '$(srcdir)/'`quorumdtest.c
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -594,6 +523,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -605,10 +535,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -631,28 +562,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -666,9 +592,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	for dir in "$(DESTDIR)$(halibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -688,7 +615,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -696,30 +623,41 @@
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
-clean-am: clean-generic clean-halibPROGRAMS clean-libtool mostlyclean-am
+clean-am: clean-generic clean-halibPROGRAMS clean-libtool \
+	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-halibPROGRAMS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -740,20 +678,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-halibPROGRAMS uninstall-info-am
+uninstall-am: uninstall-halibPROGRAMS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-halibPROGRAMS clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-halibPROGRAMS install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am \
+	install-halibPROGRAMS install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-halibPROGRAMS \
-	uninstall-info-am
+	tags uninstall uninstall-am uninstall-halibPROGRAMS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/mgmt/Makefile.in
+++ b/mgmt/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,17 +13,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +29,50 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = mgmt
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +95,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +138,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +149,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +157,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +176,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +184,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +219,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +239,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +249,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +258,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +278,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +300,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +315,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 # Author: Sun Jiang Dong <sunjd@cn.ibm.com>
 # Copyright (c) 2004 International Business Machines
@@ -359,31 +343,39 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 SUBDIRS = daemon client 
-subdir = mgmt
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-DIST_SUBDIRS = $(SUBDIRS)
 all: all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  mgmt/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  mgmt/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -391,10 +383,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -402,7 +390,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -414,15 +408,20 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -443,7 +442,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -454,14 +453,6 @@
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -470,19 +461,22 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -492,10 +486,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -518,28 +513,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -550,15 +540,19 @@
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -568,7 +562,6 @@
 all-am: Makefile
 installdirs: installdirs-recursive
 installdirs-am:
-
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -588,7 +581,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -600,25 +593,34 @@
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
+html: html-recursive
+
 info: info-recursive
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -637,26 +639,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
-	install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
-	install-recursive install-strip installcheck installcheck-am \
-	installdirs installdirs-am installdirs-recursive \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-recursive
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/mgmt/client/Makefile.in
+++ b/mgmt/client/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,13 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +32,78 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+halib_PROGRAMS = mgmtdtest$(EXEEXT)
+subdir = mgmt/client
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/haclient.py.in $(srcdir)/mgmtcmd.py.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES = haclient.py mgmtcmd.py
+am__installdirs = "$(DESTDIR)$(halibdir)" "$(DESTDIR)$(guilibdir)" \
+	"$(DESTDIR)$(guilibdir)" "$(DESTDIR)$(mozhCNdir)"
+halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(halib_PROGRAMS)
+am_mgmtdtest_OBJECTS = mgmtdtest.$(OBJEXT)
+mgmtdtest_OBJECTS = $(am_mgmtdtest_OBJECTS)
+mgmtdtest_DEPENDENCIES =  \
+	$(top_builddir)/lib/$(MGMT_DIR)/libhbmgmtclient.la \
+	$(top_builddir)/lib/$(MGMT_DIR)/libhbmgmttls.la \
+	$(top_builddir)/lib/$(MGMT_DIR)/libhbmgmtcommon.la
+mgmtdtest_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(mgmtdtest_LDFLAGS) $(LDFLAGS) -o $@
+guilibSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(guilib_SCRIPTS)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(mgmtdtest_SOURCES)
+DIST_SOURCES = $(mgmtdtest_SOURCES)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+guilibDATA_INSTALL = $(INSTALL_DATA)
+mozhCNDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(guilib_DATA) $(mozhCN_DATA)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +126,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +169,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +180,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +188,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +207,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +215,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +250,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +270,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +280,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +289,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +309,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +331,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +346,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # heartbeat: Linux-HA heartbeat code
@@ -361,7 +376,6 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 halibdir = $(libdir)/@HB_PKG@
 guilibdir = @HA_DATADIR@/heartbeat-gui
 guilib_SCRIPTS = haclient.py mgmtcmd.py
@@ -370,87 +384,68 @@
 			  start-resource.png stop-resource.png master-resource.png slave-resource.png \
 			  default-resource.png up-resource.png down-resource.png cleanup-resource.png
 
-
 INCLUDES = -I$(top_builddir)/include  -I$(top_srcdir)/include \
 			  -I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
 			  -I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
 
-
 MGMT_DIR = mgmt
-
-halib_PROGRAMS = mgmtdtest
 mgmtdtest_SOURCES = mgmtdtest.c
 mgmtdtest_LDADD = $(top_builddir)/lib/$(MGMT_DIR)/libhbmgmtclient.la \
 			  $(top_builddir)/lib/$(MGMT_DIR)/libhbmgmttls.la \
 			  $(top_builddir)/lib/$(MGMT_DIR)/libhbmgmtcommon.la
 
 mgmtdtest_LDFLAGS = $(GNUTLSLIBS)
-
 mozhCNdir = $(datadir)/locale/zh_CN/LC_MESSAGES
 mozhCN_DATA = haclient.zh_CN.mo
-
 EXTRA_DIST = $(guilib_DATA) $(mozhCN_DATA)
-subdir = mgmt/client
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES = haclient.py mgmtcmd.py
-halib_PROGRAMS = mgmtdtest$(EXEEXT)
-PROGRAMS = $(halib_PROGRAMS)
-
-am_mgmtdtest_OBJECTS = mgmtdtest.$(OBJEXT)
-mgmtdtest_OBJECTS = $(am_mgmtdtest_OBJECTS)
-mgmtdtest_DEPENDENCIES = \
-	$(top_builddir)/lib/$(MGMT_DIR)/libhbmgmtclient.la \
-	$(top_builddir)/lib/$(MGMT_DIR)/libhbmgmttls.la \
-	$(top_builddir)/lib/$(MGMT_DIR)/libhbmgmtcommon.la
-SCRIPTS = $(guilib_SCRIPTS)
-
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/mgmtdtest.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(mgmtdtest_SOURCES)
-DATA = $(guilib_DATA) $(mozhCN_DATA)
-
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am haclient.py.in \
-	mgmtcmd.py.in
-SOURCES = $(mgmtdtest_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .mo .o .obj .po
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  mgmt/client/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  mgmt/client/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-haclient.py: $(top_builddir)/config.status haclient.py.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+haclient.py: $(top_builddir)/config.status $(srcdir)/haclient.py.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-mgmtcmd.py: $(top_builddir)/config.status mgmtcmd.py.in
+mgmtcmd.py: $(top_builddir)/config.status $(srcdir)/mgmtcmd.py.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-halibPROGRAMS: $(halib_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	test -z "$(halibdir)" || $(MKDIR_P) "$(DESTDIR)$(halibdir)"
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -458,8 +453,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(halibdir)/$$f"; \
-	  rm -f $(DESTDIR)$(halibdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(halibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(halibdir)/$$f"; \
 	done
 
 clean-halibPROGRAMS:
@@ -470,17 +465,16 @@
 	done
 mgmtdtest$(EXEEXT): $(mgmtdtest_OBJECTS) $(mgmtdtest_DEPENDENCIES) 
 	@rm -f mgmtdtest$(EXEEXT)
-	$(LINK) $(mgmtdtest_LDFLAGS) $(mgmtdtest_OBJECTS) $(mgmtdtest_LDADD) $(LIBS)
-guilibSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+	$(mgmtdtest_LINK) $(mgmtdtest_OBJECTS) $(mgmtdtest_LDADD) $(LIBS)
 install-guilibSCRIPTS: $(guilib_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(guilibdir)
+	test -z "$(guilibdir)" || $(MKDIR_P) "$(DESTDIR)$(guilibdir)"
 	@list='$(guilib_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(guilibSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(guilibdir)/$$f"; \
-	    $(guilibSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(guilibdir)/$$f; \
+	    echo " $(guilibSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(guilibdir)/$$f'"; \
+	    $(guilibSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(guilibdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -488,12 +482,12 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(guilib_SCRIPTS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f $(DESTDIR)$(guilibdir)/$$f"; \
-	  rm -f $(DESTDIR)$(guilibdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(guilibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(guilibdir)/$$f"; \
 	done
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -501,92 +495,66 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mgmtdtest.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-guilibDATA_INSTALL = $(INSTALL_DATA)
 install-guilibDATA: $(guilib_DATA)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(guilibdir)
+	test -z "$(guilibdir)" || $(MKDIR_P) "$(DESTDIR)$(guilibdir)"
 	@list='$(guilib_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(guilibDATA_INSTALL) $$d$$p $(DESTDIR)$(guilibdir)/$$f"; \
-	  $(guilibDATA_INSTALL) $$d$$p $(DESTDIR)$(guilibdir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " $(guilibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(guilibdir)/$$f'"; \
+	  $(guilibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(guilibdir)/$$f"; \
 	done
 
 uninstall-guilibDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(guilib_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(guilibdir)/$$f"; \
-	  rm -f $(DESTDIR)$(guilibdir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(guilibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(guilibdir)/$$f"; \
 	done
-mozhCNDATA_INSTALL = $(INSTALL_DATA)
 install-mozhCNDATA: $(mozhCN_DATA)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(mozhCNdir)
+	test -z "$(mozhCNdir)" || $(MKDIR_P) "$(DESTDIR)$(mozhCNdir)"
 	@list='$(mozhCN_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(mozhCNDATA_INSTALL) $$d$$p $(DESTDIR)$(mozhCNdir)/$$f"; \
-	  $(mozhCNDATA_INSTALL) $$d$$p $(DESTDIR)$(mozhCNdir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " $(mozhCNDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mozhCNdir)/$$f'"; \
+	  $(mozhCNDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mozhCNdir)/$$f"; \
 	done
 
 uninstall-mozhCNDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(mozhCN_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(mozhCNdir)/$$f"; \
-	  rm -f $(DESTDIR)$(mozhCNdir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(mozhCNdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(mozhCNdir)/$$f"; \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -595,6 +563,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -606,10 +575,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -632,28 +602,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -667,9 +632,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(halibdir) $(DESTDIR)$(guilibdir) $(DESTDIR)$(guilibdir) $(DESTDIR)$(mozhCNdir)
+	for dir in "$(DESTDIR)$(halibdir)" "$(DESTDIR)$(guilibdir)" "$(DESTDIR)$(guilibdir)" "$(DESTDIR)$(mozhCNdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -689,7 +655,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -697,18 +663,21 @@
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
-clean-am: clean-generic clean-halibPROGRAMS clean-libtool mostlyclean-am
+clean-am: clean-generic clean-halibPROGRAMS clean-libtool \
+	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -718,12 +687,20 @@
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -745,21 +722,26 @@
 ps-am:
 
 uninstall-am: uninstall-guilibDATA uninstall-guilibSCRIPTS \
-	uninstall-halibPROGRAMS uninstall-info-am uninstall-mozhCNDATA
+	uninstall-halibPROGRAMS uninstall-mozhCNDATA
+
+.MAKE: install-am install-data-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-halibPROGRAMS clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-data-hook install-dvi install-dvi-am install-exec \
 	install-exec-am install-guilibDATA install-guilibSCRIPTS \
-	install-halibPROGRAMS install-info install-info-am install-man \
-	install-mozhCNDATA install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-guilibDATA uninstall-guilibSCRIPTS \
-	uninstall-halibPROGRAMS uninstall-info-am uninstall-mozhCNDATA
+	install-halibPROGRAMS install-html install-html-am \
+	install-info install-info-am install-man install-mozhCNDATA \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-guilibDATA uninstall-guilibSCRIPTS \
+	uninstall-halibPROGRAMS uninstall-mozhCNDATA
 
 
 install-data-hook:
--- a/mgmt/daemon/Makefile.in
+++ b/mgmt/daemon/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,14 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
+
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +33,97 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+halib_PROGRAMS = mgmtd$(EXEEXT)
+subdir = mgmt/daemon
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(halibdir)" \
+	"$(DESTDIR)$(pamdir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+am__DEPENDENCIES_2 = $(top_builddir)/lib/clplumbing/libplumb.la \
+	$(am__DEPENDENCIES_1)
+libhbmgmt_la_DEPENDENCIES = $(top_builddir)/lib/mgmt/libhbmgmttls.la \
+	$(top_builddir)/lib/crm/cib/libcib.la \
+	$(top_builddir)/lib/crm/common/libcrmcommon.la \
+	$(top_builddir)/lib/apphb/libapphb.la \
+	$(top_builddir)/lib/crm/pengine/libpe_status.la \
+	$(top_builddir)/lib/hbclient/libhbclient.la \
+	$(top_builddir)/lib/crm/pengine/libpe_status.la \
+	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
+am_libhbmgmt_la_OBJECTS = libhbmgmt_la-mgmt_lib.lo \
+	libhbmgmt_la-mgmt_crm.lo libhbmgmt_la-mgmt_lrm.lo \
+	libhbmgmt_la-mgmt_hb.lo
+libhbmgmt_la_OBJECTS = $(am_libhbmgmt_la_OBJECTS)
+libhbmgmt_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libhbmgmt_la_CFLAGS) \
+	$(CFLAGS) $(libhbmgmt_la_LDFLAGS) $(LDFLAGS) -o $@
+halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(halib_PROGRAMS)
+am_mgmtd_OBJECTS = mgmtd.$(OBJEXT)
+mgmtd_OBJECTS = $(am_mgmtd_OBJECTS)
+mgmtd_DEPENDENCIES = $(top_builddir)/lib/mgmt/libhbmgmtclient.la \
+	$(top_builddir)/lib/mgmt/libhbmgmttls.la libhbmgmt.la \
+	$(top_builddir)/lib/$(LRM_DIR)/liblrm.la \
+	$(top_builddir)/lib/mgmt/libhbmgmtcommon.la \
+	$(am__DEPENDENCIES_2)
+mgmtd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(mgmtd_LDFLAGS) \
+	$(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libhbmgmt_la_SOURCES) $(mgmtd_SOURCES)
+DIST_SOURCES = $(libhbmgmt_la_SOURCES) $(mgmtd_SOURCES)
+pamDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pam_DATA)
+HEADERS = $(noinst_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +146,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +189,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +200,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +208,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +227,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +235,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +270,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +290,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +300,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +309,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +329,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +351,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +366,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 #  Author: Sun Jiang Dong <sunjd@cn.ibm.com>
@@ -360,27 +395,20 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include  -I$(top_srcdir)/include     \
                   -I$(top_builddir)/libltdl  -I$(top_srcdir)/libltdl     \
 		  -I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha    \
 		  -I$(top_builddir)          -I$(top_srcdir)
 
-
 halibdir = $(libdir)/@HB_PKG@
-
 COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la   \
 		   $(GLIBLIB)
 
 noinst_HEADERS = mgmt_internal.h
 EXTRA_DIST = mgmtd.pam
-
 LRM_DIR = lrm
-
 pamdir = /etc/pam.d
 pam_DATA = mgmtd.pam
-
-halib_PROGRAMS = mgmtd
 mgmtd_SOURCES = mgmtd.c
 mgmtd_LDFLAGS = -lpam
 mgmtd_LDADD = $(top_builddir)/lib/mgmt/libhbmgmtclient.la \
@@ -390,7 +418,6 @@
 		   $(top_builddir)/lib/mgmt/libhbmgmtcommon.la \
 		   $(COMMONLIBS)
 
-
 lib_LTLIBRARIES = libhbmgmt.la
 libhbmgmt_la_SOURCES = mgmt_lib.c mgmt_crm.c mgmt_lrm.c mgmt_hb.c
 libhbmgmt_la_CFLAGS = $(INCLUDES)
@@ -404,111 +431,79 @@
 		   	$(top_builddir)/lib/crm/pengine/libpe_status.la	\
 			$(COMMONLIBS) $(CURSESLIBS)
 
-subdir = mgmt/daemon
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(lib_LTLIBRARIES)
-
-libhbmgmt_la_DEPENDENCIES = $(top_builddir)/lib/mgmt/libhbmgmttls.la \
-	$(top_builddir)/lib/crm/cib/libcib.la \
-	$(top_builddir)/lib/crm/common/libcrmcommon.la \
-	$(top_builddir)/lib/apphb/libapphb.la \
-	$(top_builddir)/lib/crm/pengine/libpe_status.la \
-	$(top_builddir)/lib/hbclient/libhbclient.la \
-	$(top_builddir)/lib/crm/pengine/libpe_status.la \
-	$(top_builddir)/lib/clplumbing/libplumb.la
-am_libhbmgmt_la_OBJECTS = libhbmgmt_la-mgmt_lib.lo \
-	libhbmgmt_la-mgmt_crm.lo libhbmgmt_la-mgmt_lrm.lo \
-	libhbmgmt_la-mgmt_hb.lo
-libhbmgmt_la_OBJECTS = $(am_libhbmgmt_la_OBJECTS)
-halib_PROGRAMS = mgmtd$(EXEEXT)
-PROGRAMS = $(halib_PROGRAMS)
-
-am_mgmtd_OBJECTS = mgmtd.$(OBJEXT)
-mgmtd_OBJECTS = $(am_mgmtd_OBJECTS)
-mgmtd_DEPENDENCIES = $(top_builddir)/lib/mgmt/libhbmgmtclient.la \
-	$(top_builddir)/lib/mgmt/libhbmgmttls.la libhbmgmt.la \
-	$(top_builddir)/lib/$(LRM_DIR)/liblrm.la \
-	$(top_builddir)/lib/mgmt/libhbmgmtcommon.la \
-	$(top_builddir)/lib/clplumbing/libplumb.la
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libhbmgmt_la-mgmt_crm.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libhbmgmt_la-mgmt_hb.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libhbmgmt_la-mgmt_lib.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libhbmgmt_la-mgmt_lrm.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/mgmtd.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libhbmgmt_la_SOURCES) $(mgmtd_SOURCES)
-DATA = $(pam_DATA)
-
-HEADERS = $(noinst_HEADERS)
-
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(libhbmgmt_la_SOURCES) $(mgmtd_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  mgmt/daemon/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  mgmt/daemon/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-libLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libhbmgmt.la: $(libhbmgmt_la_OBJECTS) $(libhbmgmt_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libhbmgmt_la_LDFLAGS) $(libhbmgmt_la_OBJECTS) $(libhbmgmt_la_LIBADD) $(LIBS)
-halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+	$(libhbmgmt_la_LINK) -rpath $(libdir) $(libhbmgmt_la_OBJECTS) $(libhbmgmt_la_LIBADD) $(LIBS)
 install-halibPROGRAMS: $(halib_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	test -z "$(halibdir)" || $(MKDIR_P) "$(DESTDIR)$(halibdir)"
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -516,8 +511,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(halibdir)/$$f"; \
-	  rm -f $(DESTDIR)$(halibdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(halibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(halibdir)/$$f"; \
 	done
 
 clean-halibPROGRAMS:
@@ -528,10 +523,10 @@
 	done
 mgmtd$(EXEEXT): $(mgmtd_OBJECTS) $(mgmtd_DEPENDENCIES) 
 	@rm -f mgmtd$(EXEEXT)
-	$(LINK) $(mgmtd_LDFLAGS) $(mgmtd_OBJECTS) $(mgmtd_LDADD) $(LIBS)
+	$(mgmtd_LINK) $(mgmtd_OBJECTS) $(mgmtd_LDADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -543,206 +538,77 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mgmtd.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-libhbmgmt_la-mgmt_lib.o: mgmt_lib.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -MT libhbmgmt_la-mgmt_lib.o -MD -MP -MF "$(DEPDIR)/libhbmgmt_la-mgmt_lib.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libhbmgmt_la-mgmt_lib.o `test -f 'mgmt_lib.c' || echo '$(srcdir)/'`mgmt_lib.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libhbmgmt_la-mgmt_lib.Tpo" "$(DEPDIR)/libhbmgmt_la-mgmt_lib.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libhbmgmt_la-mgmt_lib.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgmt_lib.c' object='libhbmgmt_la-mgmt_lib.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libhbmgmt_la-mgmt_lib.Po' tmpdepfile='$(DEPDIR)/libhbmgmt_la-mgmt_lib.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -c -o libhbmgmt_la-mgmt_lib.o `test -f 'mgmt_lib.c' || echo '$(srcdir)/'`mgmt_lib.c
-
-libhbmgmt_la-mgmt_lib.obj: mgmt_lib.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -MT libhbmgmt_la-mgmt_lib.obj -MD -MP -MF "$(DEPDIR)/libhbmgmt_la-mgmt_lib.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libhbmgmt_la-mgmt_lib.obj `if test -f 'mgmt_lib.c'; then $(CYGPATH_W) 'mgmt_lib.c'; else $(CYGPATH_W) '$(srcdir)/mgmt_lib.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libhbmgmt_la-mgmt_lib.Tpo" "$(DEPDIR)/libhbmgmt_la-mgmt_lib.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libhbmgmt_la-mgmt_lib.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgmt_lib.c' object='libhbmgmt_la-mgmt_lib.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libhbmgmt_la-mgmt_lib.Po' tmpdepfile='$(DEPDIR)/libhbmgmt_la-mgmt_lib.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -c -o libhbmgmt_la-mgmt_lib.obj `if test -f 'mgmt_lib.c'; then $(CYGPATH_W) 'mgmt_lib.c'; else $(CYGPATH_W) '$(srcdir)/mgmt_lib.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 libhbmgmt_la-mgmt_lib.lo: mgmt_lib.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -MT libhbmgmt_la-mgmt_lib.lo -MD -MP -MF "$(DEPDIR)/libhbmgmt_la-mgmt_lib.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libhbmgmt_la-mgmt_lib.lo `test -f 'mgmt_lib.c' || echo '$(srcdir)/'`mgmt_lib.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libhbmgmt_la-mgmt_lib.Tpo" "$(DEPDIR)/libhbmgmt_la-mgmt_lib.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libhbmgmt_la-mgmt_lib.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -MT libhbmgmt_la-mgmt_lib.lo -MD -MP -MF $(DEPDIR)/libhbmgmt_la-mgmt_lib.Tpo -c -o libhbmgmt_la-mgmt_lib.lo `test -f 'mgmt_lib.c' || echo '$(srcdir)/'`mgmt_lib.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libhbmgmt_la-mgmt_lib.Tpo $(DEPDIR)/libhbmgmt_la-mgmt_lib.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgmt_lib.c' object='libhbmgmt_la-mgmt_lib.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libhbmgmt_la-mgmt_lib.Plo' tmpdepfile='$(DEPDIR)/libhbmgmt_la-mgmt_lib.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -c -o libhbmgmt_la-mgmt_lib.lo `test -f 'mgmt_lib.c' || echo '$(srcdir)/'`mgmt_lib.c
-
-libhbmgmt_la-mgmt_crm.o: mgmt_crm.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -MT libhbmgmt_la-mgmt_crm.o -MD -MP -MF "$(DEPDIR)/libhbmgmt_la-mgmt_crm.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libhbmgmt_la-mgmt_crm.o `test -f 'mgmt_crm.c' || echo '$(srcdir)/'`mgmt_crm.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libhbmgmt_la-mgmt_crm.Tpo" "$(DEPDIR)/libhbmgmt_la-mgmt_crm.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libhbmgmt_la-mgmt_crm.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgmt_crm.c' object='libhbmgmt_la-mgmt_crm.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libhbmgmt_la-mgmt_crm.Po' tmpdepfile='$(DEPDIR)/libhbmgmt_la-mgmt_crm.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -c -o libhbmgmt_la-mgmt_crm.o `test -f 'mgmt_crm.c' || echo '$(srcdir)/'`mgmt_crm.c
-
-libhbmgmt_la-mgmt_crm.obj: mgmt_crm.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -MT libhbmgmt_la-mgmt_crm.obj -MD -MP -MF "$(DEPDIR)/libhbmgmt_la-mgmt_crm.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libhbmgmt_la-mgmt_crm.obj `if test -f 'mgmt_crm.c'; then $(CYGPATH_W) 'mgmt_crm.c'; else $(CYGPATH_W) '$(srcdir)/mgmt_crm.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libhbmgmt_la-mgmt_crm.Tpo" "$(DEPDIR)/libhbmgmt_la-mgmt_crm.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libhbmgmt_la-mgmt_crm.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgmt_crm.c' object='libhbmgmt_la-mgmt_crm.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libhbmgmt_la-mgmt_crm.Po' tmpdepfile='$(DEPDIR)/libhbmgmt_la-mgmt_crm.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -c -o libhbmgmt_la-mgmt_crm.obj `if test -f 'mgmt_crm.c'; then $(CYGPATH_W) 'mgmt_crm.c'; else $(CYGPATH_W) '$(srcdir)/mgmt_crm.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -c -o libhbmgmt_la-mgmt_lib.lo `test -f 'mgmt_lib.c' || echo '$(srcdir)/'`mgmt_lib.c
 
 libhbmgmt_la-mgmt_crm.lo: mgmt_crm.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -MT libhbmgmt_la-mgmt_crm.lo -MD -MP -MF "$(DEPDIR)/libhbmgmt_la-mgmt_crm.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libhbmgmt_la-mgmt_crm.lo `test -f 'mgmt_crm.c' || echo '$(srcdir)/'`mgmt_crm.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libhbmgmt_la-mgmt_crm.Tpo" "$(DEPDIR)/libhbmgmt_la-mgmt_crm.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libhbmgmt_la-mgmt_crm.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -MT libhbmgmt_la-mgmt_crm.lo -MD -MP -MF $(DEPDIR)/libhbmgmt_la-mgmt_crm.Tpo -c -o libhbmgmt_la-mgmt_crm.lo `test -f 'mgmt_crm.c' || echo '$(srcdir)/'`mgmt_crm.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libhbmgmt_la-mgmt_crm.Tpo $(DEPDIR)/libhbmgmt_la-mgmt_crm.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgmt_crm.c' object='libhbmgmt_la-mgmt_crm.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libhbmgmt_la-mgmt_crm.Plo' tmpdepfile='$(DEPDIR)/libhbmgmt_la-mgmt_crm.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -c -o libhbmgmt_la-mgmt_crm.lo `test -f 'mgmt_crm.c' || echo '$(srcdir)/'`mgmt_crm.c
-
-libhbmgmt_la-mgmt_lrm.o: mgmt_lrm.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -MT libhbmgmt_la-mgmt_lrm.o -MD -MP -MF "$(DEPDIR)/libhbmgmt_la-mgmt_lrm.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libhbmgmt_la-mgmt_lrm.o `test -f 'mgmt_lrm.c' || echo '$(srcdir)/'`mgmt_lrm.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libhbmgmt_la-mgmt_lrm.Tpo" "$(DEPDIR)/libhbmgmt_la-mgmt_lrm.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libhbmgmt_la-mgmt_lrm.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgmt_lrm.c' object='libhbmgmt_la-mgmt_lrm.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libhbmgmt_la-mgmt_lrm.Po' tmpdepfile='$(DEPDIR)/libhbmgmt_la-mgmt_lrm.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -c -o libhbmgmt_la-mgmt_lrm.o `test -f 'mgmt_lrm.c' || echo '$(srcdir)/'`mgmt_lrm.c
-
-libhbmgmt_la-mgmt_lrm.obj: mgmt_lrm.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -MT libhbmgmt_la-mgmt_lrm.obj -MD -MP -MF "$(DEPDIR)/libhbmgmt_la-mgmt_lrm.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libhbmgmt_la-mgmt_lrm.obj `if test -f 'mgmt_lrm.c'; then $(CYGPATH_W) 'mgmt_lrm.c'; else $(CYGPATH_W) '$(srcdir)/mgmt_lrm.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libhbmgmt_la-mgmt_lrm.Tpo" "$(DEPDIR)/libhbmgmt_la-mgmt_lrm.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libhbmgmt_la-mgmt_lrm.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgmt_lrm.c' object='libhbmgmt_la-mgmt_lrm.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libhbmgmt_la-mgmt_lrm.Po' tmpdepfile='$(DEPDIR)/libhbmgmt_la-mgmt_lrm.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -c -o libhbmgmt_la-mgmt_lrm.obj `if test -f 'mgmt_lrm.c'; then $(CYGPATH_W) 'mgmt_lrm.c'; else $(CYGPATH_W) '$(srcdir)/mgmt_lrm.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -c -o libhbmgmt_la-mgmt_crm.lo `test -f 'mgmt_crm.c' || echo '$(srcdir)/'`mgmt_crm.c
 
 libhbmgmt_la-mgmt_lrm.lo: mgmt_lrm.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -MT libhbmgmt_la-mgmt_lrm.lo -MD -MP -MF "$(DEPDIR)/libhbmgmt_la-mgmt_lrm.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libhbmgmt_la-mgmt_lrm.lo `test -f 'mgmt_lrm.c' || echo '$(srcdir)/'`mgmt_lrm.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libhbmgmt_la-mgmt_lrm.Tpo" "$(DEPDIR)/libhbmgmt_la-mgmt_lrm.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libhbmgmt_la-mgmt_lrm.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -MT libhbmgmt_la-mgmt_lrm.lo -MD -MP -MF $(DEPDIR)/libhbmgmt_la-mgmt_lrm.Tpo -c -o libhbmgmt_la-mgmt_lrm.lo `test -f 'mgmt_lrm.c' || echo '$(srcdir)/'`mgmt_lrm.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libhbmgmt_la-mgmt_lrm.Tpo $(DEPDIR)/libhbmgmt_la-mgmt_lrm.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgmt_lrm.c' object='libhbmgmt_la-mgmt_lrm.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libhbmgmt_la-mgmt_lrm.Plo' tmpdepfile='$(DEPDIR)/libhbmgmt_la-mgmt_lrm.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -c -o libhbmgmt_la-mgmt_lrm.lo `test -f 'mgmt_lrm.c' || echo '$(srcdir)/'`mgmt_lrm.c
-
-libhbmgmt_la-mgmt_hb.o: mgmt_hb.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -MT libhbmgmt_la-mgmt_hb.o -MD -MP -MF "$(DEPDIR)/libhbmgmt_la-mgmt_hb.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libhbmgmt_la-mgmt_hb.o `test -f 'mgmt_hb.c' || echo '$(srcdir)/'`mgmt_hb.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libhbmgmt_la-mgmt_hb.Tpo" "$(DEPDIR)/libhbmgmt_la-mgmt_hb.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libhbmgmt_la-mgmt_hb.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgmt_hb.c' object='libhbmgmt_la-mgmt_hb.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libhbmgmt_la-mgmt_hb.Po' tmpdepfile='$(DEPDIR)/libhbmgmt_la-mgmt_hb.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -c -o libhbmgmt_la-mgmt_hb.o `test -f 'mgmt_hb.c' || echo '$(srcdir)/'`mgmt_hb.c
-
-libhbmgmt_la-mgmt_hb.obj: mgmt_hb.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -MT libhbmgmt_la-mgmt_hb.obj -MD -MP -MF "$(DEPDIR)/libhbmgmt_la-mgmt_hb.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libhbmgmt_la-mgmt_hb.obj `if test -f 'mgmt_hb.c'; then $(CYGPATH_W) 'mgmt_hb.c'; else $(CYGPATH_W) '$(srcdir)/mgmt_hb.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libhbmgmt_la-mgmt_hb.Tpo" "$(DEPDIR)/libhbmgmt_la-mgmt_hb.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libhbmgmt_la-mgmt_hb.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgmt_hb.c' object='libhbmgmt_la-mgmt_hb.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libhbmgmt_la-mgmt_hb.Po' tmpdepfile='$(DEPDIR)/libhbmgmt_la-mgmt_hb.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -c -o libhbmgmt_la-mgmt_hb.obj `if test -f 'mgmt_hb.c'; then $(CYGPATH_W) 'mgmt_hb.c'; else $(CYGPATH_W) '$(srcdir)/mgmt_hb.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -c -o libhbmgmt_la-mgmt_lrm.lo `test -f 'mgmt_lrm.c' || echo '$(srcdir)/'`mgmt_lrm.c
 
 libhbmgmt_la-mgmt_hb.lo: mgmt_hb.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -MT libhbmgmt_la-mgmt_hb.lo -MD -MP -MF "$(DEPDIR)/libhbmgmt_la-mgmt_hb.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o libhbmgmt_la-mgmt_hb.lo `test -f 'mgmt_hb.c' || echo '$(srcdir)/'`mgmt_hb.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libhbmgmt_la-mgmt_hb.Tpo" "$(DEPDIR)/libhbmgmt_la-mgmt_hb.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libhbmgmt_la-mgmt_hb.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -MT libhbmgmt_la-mgmt_hb.lo -MD -MP -MF $(DEPDIR)/libhbmgmt_la-mgmt_hb.Tpo -c -o libhbmgmt_la-mgmt_hb.lo `test -f 'mgmt_hb.c' || echo '$(srcdir)/'`mgmt_hb.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libhbmgmt_la-mgmt_hb.Tpo $(DEPDIR)/libhbmgmt_la-mgmt_hb.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mgmt_hb.c' object='libhbmgmt_la-mgmt_hb.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libhbmgmt_la-mgmt_hb.Plo' tmpdepfile='$(DEPDIR)/libhbmgmt_la-mgmt_hb.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -c -o libhbmgmt_la-mgmt_hb.lo `test -f 'mgmt_hb.c' || echo '$(srcdir)/'`mgmt_hb.c
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhbmgmt_la_CFLAGS) $(CFLAGS) -c -o libhbmgmt_la-mgmt_hb.lo `test -f 'mgmt_hb.c' || echo '$(srcdir)/'`mgmt_hb.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-pamDATA_INSTALL = $(INSTALL_DATA)
 install-pamDATA: $(pam_DATA)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(pamdir)
+	test -z "$(pamdir)" || $(MKDIR_P) "$(DESTDIR)$(pamdir)"
 	@list='$(pam_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(pamDATA_INSTALL) $$d$$p $(DESTDIR)$(pamdir)/$$f"; \
-	  $(pamDATA_INSTALL) $$d$$p $(DESTDIR)$(pamdir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " $(pamDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pamdir)/$$f'"; \
+	  $(pamDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pamdir)/$$f"; \
 	done
 
 uninstall-pamDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(pam_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(pamdir)/$$f"; \
-	  rm -f $(DESTDIR)$(pamdir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(pamdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pamdir)/$$f"; \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -751,6 +617,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -762,10 +629,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -788,28 +656,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -823,9 +686,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(halibdir) $(DESTDIR)$(pamdir)
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(halibdir)" "$(DESTDIR)$(pamdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -845,7 +709,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -860,12 +724,14 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -874,12 +740,20 @@
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -900,21 +774,25 @@
 
 ps-am:
 
-uninstall-am: uninstall-halibPROGRAMS uninstall-info-am \
-	uninstall-libLTLIBRARIES uninstall-pamDATA
+uninstall-am: uninstall-halibPROGRAMS uninstall-libLTLIBRARIES \
+	uninstall-pamDATA
+
+.MAKE: install-am install-data-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-halibPROGRAMS clean-libLTLIBRARIES clean-libtool ctags \
-	distclean distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-halibPROGRAMS install-info \
-	install-info-am install-libLTLIBRARIES install-man \
-	install-pamDATA install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-halibPROGRAMS uninstall-info-am \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-data-hook install-dvi install-dvi-am \
+	install-exec install-exec-am install-halibPROGRAMS \
+	install-html install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pamDATA install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-halibPROGRAMS \
 	uninstall-libLTLIBRARIES uninstall-pamDATA
 
 
--- a/pkg/Makefile.in
+++ b/pkg/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -37,17 +37,11 @@
 # Overview of principle:
 # 1. "make install" as a pseudo-install to a temporary location $(TMPINSTDIR)
 # 2. "pkgmk" from whatever is in $(TMPINSTDIR) into a pkg area $(PKGDIR)
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -59,39 +53,38 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = pkg
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -114,8 +107,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -159,8 +150,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -172,6 +161,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -179,12 +169,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -202,8 +188,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -212,15 +196,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -250,8 +231,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -272,8 +251,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -284,20 +261,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -305,17 +270,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -323,6 +290,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -344,6 +312,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -358,92 +327,94 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 MAINTAINERCLEANFILES = Makefile.in
-
 PKGINFO = $(INFOFILES)/prototype		\
 		$(INFOFILES)/pkginfo		\
 		$(INFOFILES)/preinstall		\
 		$(INFOFILES)/postinstall
 
-
 EXTRA_DIST = $(INFOFILES)/pkginfo.in		\
 		$(INFOFILES)/preinstall.in	\
 		$(INFOFILES)/postinstall.in
 
-
 CLEANFILES = stamp-tmpinst $(INFOFILES)/prototype
-
 DISTCLEANFILES = $(PKGINFO)
-
 PKGDIR = packages
-
 INFOFILES = InfoFiles
 
 # A pseudo-install directory, so that we know what files are generated.
 # This allows libtool to maintain its flexibility.
 TMPINSTDIR = tmpinst
-subdir = pkg
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  pkg/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  pkg/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
 ctags: CTAGS
 CTAGS:
 
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	$(mkinstalldirs) $(distdir)/$(INFOFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -457,7 +428,6 @@
 check-am: all-am
 check: check-am
 all-am: Makefile
-
 installdirs:
 install: install-am
 install-exec: install-exec-am
@@ -479,7 +449,7 @@
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -492,24 +462,34 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -528,17 +508,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	clean-local distclean distclean-generic distclean-libtool \
-	distdir dvi dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am
 
 
 # Main target
--- a/port/Makefile.in
+++ b/port/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -37,17 +37,11 @@
 # Overview of principle:
 # 1. "make install" as a pseudo-install to a temporary location $(TMPINSTDIR)
 # 2. "pkgmk" from whatever is in $(TMPINSTDIR) into a pkg area $(PKGDIR)
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -59,39 +53,39 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = port
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/portMakefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES = portMakefile
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -114,8 +108,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -159,8 +151,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -172,6 +162,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -179,12 +170,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -202,8 +189,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -212,15 +197,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -236,7 +218,6 @@
 PING = @PING@
 PING_TIMEOUT_OPT = @PING_TIMEOUT_OPT@
 PKGCONFIG = @PKGCONFIG@
-
 PKGNAME = OPENHA
 POD2MAN = @POD2MAN@
 POWEROFF_CMD = @POWEROFF_CMD@
@@ -251,8 +232,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -273,33 +252,18 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
 STRIP = @STRIP@
 SWIG = @SWIG@
 TAR = @TAR@
-
 TARFILE = @TARFILE@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -307,17 +271,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -325,6 +291,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -346,6 +313,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -360,15 +328,16 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 MAINTAINERCLEANFILES = Makefile.in
-
 EXTRA_DIST = \
 		portMakefile.in			\
 		heartbeat/pkg-deinstall.in		\
@@ -376,31 +345,45 @@
 		heartbeat/pkg-install.in		\
 		heartbeat/pkg-plist.in
 
-
 CLEANFILES = 
-
 DISTCLEANFILES = $(PKGINFO)
 
 # A pseudo-install directory, so that we know what files are generated.
 # This allows libtool to maintain its flexibility.
 TMPINSTDIR = tmpinst
-subdir = port
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES = portMakefile
-DIST_SOURCES =
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am portMakefile.in
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  port/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  port/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-portMakefile: $(top_builddir)/config.status portMakefile.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+portMakefile: $(top_builddir)/config.status $(srcdir)/portMakefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 mostlyclean-libtool:
@@ -408,39 +391,29 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
 ctags: CTAGS
 CTAGS:
 
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	$(mkinstalldirs) $(distdir)/heartbeat
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -454,7 +427,6 @@
 check-am: all-am
 check: check-am
 all-am: Makefile
-
 installdirs:
 install: install-am
 install-exec: install-exec-am
@@ -476,37 +448,45 @@
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
 clean-am: clean-generic clean-libtool clean-local mostlyclean-am
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -525,17 +505,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	clean-local distclean distclean-generic distclean-libtool \
-	distdir dvi dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am
 
 
 # Main target
--- a/replace/Makefile.in
+++ b/replace/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -31,16 +31,11 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -52,39 +47,59 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = replace
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	NoSuchFunctionName.c alphasort.c daemon.c inet_pton.c \
+	scandir.c setenv.c strerror.c strlcat.c strlcpy.c strndup.c \
+	strnlen.c unsetenv.c uuid_parse.c
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libreplace_la_DEPENDENCIES = @LTLIBOBJS@
+am_libreplace_la_OBJECTS =
+libreplace_la_OBJECTS = $(am_libreplace_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libreplace_la_SOURCES)
+DIST_SOURCES = $(libreplace_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -107,8 +122,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -152,8 +165,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -165,6 +176,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -172,12 +184,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -195,8 +203,6 @@
 LIBTOOL = @LIBTOOL@ @QUIET_LIBTOOL_OPTS@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -205,15 +211,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -241,11 +244,8 @@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
 PYTHON_PREFIX = @PYTHON_PREFIX@
 PYTHON_VERSION = @PYTHON_VERSION@
-
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -266,8 +266,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -278,20 +276,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -299,17 +285,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -317,6 +305,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -338,6 +327,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -352,81 +342,69 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \
 		-I$(top_srcdir)/linux-ha -I$(top_builddir)/linux-ha
 
-
 noinst_LTLIBRARIES = libreplace.la
 libreplace_la_SOURCES = 
 libreplace_la_LIBADD = @LTLIBOBJS@
-subdir = replace
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-
-libreplace_la_LDFLAGS =
-libreplace_la_DEPENDENCIES = @LTLIBOBJS@
-am_libreplace_la_OBJECTS =
-libreplace_la_OBJECTS = $(am_libreplace_la_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/NoSuchFunctionName.Plo \
-@AMDEP_TRUE@	$(DEPDIR)/alphasort.Plo $(DEPDIR)/daemon.Plo \
-@AMDEP_TRUE@	$(DEPDIR)/inet_pton.Plo $(DEPDIR)/scandir.Plo \
-@AMDEP_TRUE@	$(DEPDIR)/setenv.Plo $(DEPDIR)/strerror.Plo \
-@AMDEP_TRUE@	$(DEPDIR)/strlcat.Plo $(DEPDIR)/strlcpy.Plo \
-@AMDEP_TRUE@	$(DEPDIR)/strndup.Plo $(DEPDIR)/strnlen.Plo \
-@AMDEP_TRUE@	$(DEPDIR)/unsetenv.Plo $(DEPDIR)/uuid_parse.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libreplace_la_SOURCES)
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am NoSuchFunctionName.c \
-	alphasort.c daemon.c inet_pton.c scandir.c setenv.c strerror.c \
-	strlcat.c strlcpy.c strndup.c strnlen.c unsetenv.c uuid_parse.c
-SOURCES = $(libreplace_la_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  replace/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  replace/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
 	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libreplace.la: $(libreplace_la_OBJECTS) $(libreplace_la_DEPENDENCIES) 
-	$(LINK)  $(libreplace_la_LDFLAGS) $(libreplace_la_OBJECTS) $(libreplace_la_LIBADD) $(LIBS)
+	$(LINK)  $(libreplace_la_OBJECTS) $(libreplace_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -446,37 +424,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/uuid_parse.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -484,18 +450,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -504,6 +458,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -515,10 +470,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -541,28 +497,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -576,7 +527,6 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
-
 installdirs:
 install: install-am
 install-exec: install-exec-am
@@ -597,7 +547,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -612,24 +562,34 @@
 	-rm -rf $(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -650,18 +610,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
-	pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/resources/Makefile.in
+++ b/resources/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,17 +13,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +29,50 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = resources
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +95,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +138,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +149,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +157,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +176,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +184,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +219,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +239,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +249,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +258,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +278,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +300,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +315,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 # Author: Sun Jiang Dong <sunjd@cn.ibm.com>
 # Copyright (c) 2004 International Business Machines
@@ -359,31 +343,39 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 SUBDIRS = OCF heartbeat
-subdir = resources
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-DIST_SUBDIRS = $(SUBDIRS)
 all: all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  resources/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  resources/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -391,10 +383,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -402,7 +390,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -414,15 +408,20 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -443,7 +442,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -454,14 +453,6 @@
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -470,19 +461,22 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -492,10 +486,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -518,28 +513,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -550,15 +540,19 @@
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -568,7 +562,6 @@
 all-am: Makefile
 installdirs: installdirs-recursive
 installdirs-am:
-
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -588,7 +581,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -600,25 +593,34 @@
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
+html: html-recursive
+
 info: info-recursive
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -637,26 +639,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
-	install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
-	install-recursive install-strip installcheck installcheck-am \
-	installdirs installdirs-am installdirs-recursive \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-recursive
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/resources/OCF/Makefile.in
+++ b/resources/OCF/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,12 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +31,69 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+@USE_IPV6ADDR_TRUE@ocf_PROGRAMS = IPv6addr$(EXEEXT)
+subdir = resources/OCF
+DIST_COMMON = $(srcdir)/.ocf-binaries.in $(srcdir)/.ocf-directories.in \
+	$(srcdir)/.ocf-shellfuncs.in $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/ocf-returncodes.in \
+	$(srcdir)/ocf-shellfuncs.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES = .ocf-binaries .ocf-directories .ocf-shellfuncs \
+	ocf-returncodes ocf-shellfuncs
+am__installdirs = "$(DESTDIR)$(ocfdir)" "$(DESTDIR)$(commondir)" \
+	"$(DESTDIR)$(ocfdir)"
+ocfPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(ocf_PROGRAMS)
+am_IPv6addr_OBJECTS = IPv6addr.$(OBJEXT)
+IPv6addr_OBJECTS = $(am_IPv6addr_OBJECTS)
+am__DEPENDENCIES_1 =
+IPv6addr_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
+	$(am__DEPENDENCIES_1)
+commonSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ocfSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(common_SCRIPTS) $(ocf_SCRIPTS)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(IPv6addr_SOURCES)
+DIST_SOURCES = $(IPv6addr_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +116,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +159,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +170,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +178,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +197,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +205,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +240,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +260,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +270,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +279,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +299,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +321,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +336,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 # Makefile.am for OCF RAs
 #
@@ -362,22 +367,13 @@
 #
 MAINTAINERCLEANFILES = Makefile.in
 EXTRA_DIST = $(ocf_SCRIPTS)
-
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/linux-ha
-
 ocfdir = @OCF_RA_DIR@/heartbeat
-
 gliblib = @GLIBLIB@
-@USE_IPV6ADDR_FALSE@ocf_PROGRAMS = 
-
-@USE_IPV6ADDR_TRUE@ocf_PROGRAMS = IPv6addr
-
 IPv6addr_SOURCES = IPv6addr.c
-
 IPv6addr_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la    \
                         $(gliblib) @LIBNETLIBS@
 
-
 ocf_SCRIPTS = ClusterMon 	\
 			Dummy		\
 		        IPaddr		\
@@ -415,6 +411,7 @@
 			SAPInstance	\
 			SendArp		\
 			ServeRAID	\
+			SphinxSearchDaemon	\
 			Stateful	\
 			SysInfo		\
 			tomcat		\
@@ -429,76 +426,63 @@
 			.ocf-directories \
 			.ocf-returncodes
 
-
 commondir = @HA_LIBHBDIR@
 # Legacy locations
 common_SCRIPTS = ocf-shellfuncs ocf-returncodes
-subdir = resources/OCF
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES = .ocf-binaries .ocf-directories .ocf-shellfuncs \
-	ocf-returncodes ocf-shellfuncs
-@USE_IPV6ADDR_TRUE@ocf_PROGRAMS = IPv6addr$(EXEEXT)
-@USE_IPV6ADDR_FALSE@ocf_PROGRAMS =
-PROGRAMS = $(ocf_PROGRAMS)
-
-am_IPv6addr_OBJECTS = IPv6addr.$(OBJEXT)
-IPv6addr_OBJECTS = $(am_IPv6addr_OBJECTS)
-IPv6addr_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la
-IPv6addr_LDFLAGS =
-SCRIPTS = $(common_SCRIPTS) $(ocf_SCRIPTS)
-
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/IPv6addr.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(IPv6addr_SOURCES)
-DIST_COMMON = $(srcdir)/Makefile.in .ocf-binaries.in \
-	.ocf-directories.in .ocf-shellfuncs.in Makefile.am \
-	ocf-returncodes.in ocf-shellfuncs.in
-SOURCES = $(IPv6addr_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  resources/OCF/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  resources/OCF/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-.ocf-binaries: $(top_builddir)/config.status .ocf-binaries.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+.ocf-binaries: $(top_builddir)/config.status $(srcdir)/.ocf-binaries.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-.ocf-directories: $(top_builddir)/config.status .ocf-directories.in
+.ocf-directories: $(top_builddir)/config.status $(srcdir)/.ocf-directories.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-.ocf-shellfuncs: $(top_builddir)/config.status .ocf-shellfuncs.in
+.ocf-shellfuncs: $(top_builddir)/config.status $(srcdir)/.ocf-shellfuncs.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-ocf-returncodes: $(top_builddir)/config.status ocf-returncodes.in
+ocf-returncodes: $(top_builddir)/config.status $(srcdir)/ocf-returncodes.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-ocf-shellfuncs: $(top_builddir)/config.status ocf-shellfuncs.in
+ocf-shellfuncs: $(top_builddir)/config.status $(srcdir)/ocf-shellfuncs.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-ocfPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-ocfPROGRAMS: $(ocf_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(ocfdir)
+	test -z "$(ocfdir)" || $(MKDIR_P) "$(DESTDIR)$(ocfdir)"
 	@list='$(ocf_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(ocfPROGRAMS_INSTALL) $$p $(DESTDIR)$(ocfdir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(ocfPROGRAMS_INSTALL) $$p $(DESTDIR)$(ocfdir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(ocfPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(ocfdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(ocfPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(ocfdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -506,8 +490,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(ocf_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(ocfdir)/$$f"; \
-	  rm -f $(DESTDIR)$(ocfdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(ocfdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(ocfdir)/$$f"; \
 	done
 
 clean-ocfPROGRAMS:
@@ -518,17 +502,16 @@
 	done
 IPv6addr$(EXEEXT): $(IPv6addr_OBJECTS) $(IPv6addr_DEPENDENCIES) 
 	@rm -f IPv6addr$(EXEEXT)
-	$(LINK) $(IPv6addr_LDFLAGS) $(IPv6addr_OBJECTS) $(IPv6addr_LDADD) $(LIBS)
-commonSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+	$(LINK) $(IPv6addr_OBJECTS) $(IPv6addr_LDADD) $(LIBS)
 install-commonSCRIPTS: $(common_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(commondir)
+	test -z "$(commondir)" || $(MKDIR_P) "$(DESTDIR)$(commondir)"
 	@list='$(common_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(commonSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(commondir)/$$f"; \
-	    $(commonSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(commondir)/$$f; \
+	    echo " $(commonSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(commondir)/$$f'"; \
+	    $(commonSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(commondir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -536,19 +519,18 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(common_SCRIPTS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f $(DESTDIR)$(commondir)/$$f"; \
-	  rm -f $(DESTDIR)$(commondir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(commondir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(commondir)/$$f"; \
 	done
-ocfSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 install-ocfSCRIPTS: $(ocf_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(ocfdir)
+	test -z "$(ocfdir)" || $(MKDIR_P) "$(DESTDIR)$(ocfdir)"
 	@list='$(ocf_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(ocfSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(ocfdir)/$$f"; \
-	    $(ocfSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(ocfdir)/$$f; \
+	    echo " $(ocfSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(ocfdir)/$$f'"; \
+	    $(ocfSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(ocfdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -556,12 +538,12 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(ocf_SCRIPTS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f $(DESTDIR)$(ocfdir)/$$f"; \
-	  rm -f $(DESTDIR)$(ocfdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(ocfdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(ocfdir)/$$f"; \
 	done
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -569,37 +551,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IPv6addr.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -607,18 +577,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -627,6 +585,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -638,10 +597,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -664,28 +624,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -699,9 +654,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(SCRIPTS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(ocfdir) $(DESTDIR)$(commondir) $(DESTDIR)$(ocfdir)
+	for dir in "$(DESTDIR)$(ocfdir)" "$(DESTDIR)$(commondir)" "$(DESTDIR)$(ocfdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -721,7 +677,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -735,12 +691,14 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -748,12 +706,20 @@
 install-data-am: install-commonSCRIPTS install-ocfPROGRAMS \
 	install-ocfSCRIPTS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -774,21 +740,25 @@
 
 ps-am:
 
-uninstall-am: uninstall-commonSCRIPTS uninstall-info-am \
-	uninstall-ocfPROGRAMS uninstall-ocfSCRIPTS
+uninstall-am: uninstall-commonSCRIPTS uninstall-ocfPROGRAMS \
+	uninstall-ocfSCRIPTS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-ocfPROGRAMS ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-commonSCRIPTS install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-ocfPROGRAMS install-ocfSCRIPTS \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
-	pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-commonSCRIPTS uninstall-info-am uninstall-ocfPROGRAMS \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-commonSCRIPTS install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-ocfPROGRAMS \
+	install-ocfSCRIPTS install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-commonSCRIPTS uninstall-ocfPROGRAMS \
 	uninstall-ocfSCRIPTS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/resources/heartbeat/Makefile.in
+++ b/resources/heartbeat/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,54 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = resources/heartbeat
+DIST_COMMON = $(srcdir)/AudibleAlarm.in $(srcdir)/Delay.in \
+	$(srcdir)/Filesystem.in $(srcdir)/ICP.in $(srcdir)/IPaddr.in \
+	$(srcdir)/IPaddr2.in $(srcdir)/IPsrcaddr.in \
+	$(srcdir)/IPv6addr.in $(srcdir)/LVM.in \
+	$(srcdir)/LVSSyncDaemonSwap.in $(srcdir)/LinuxSCSI.in \
+	$(srcdir)/MailTo.in $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/OCF.in $(srcdir)/Raid1.in \
+	$(srcdir)/SendArp.in $(srcdir)/ServeRAID.in $(srcdir)/WAS.in \
+	$(srcdir)/WinPopup.in $(srcdir)/Xinetd.in $(srcdir)/apache.in \
+	$(srcdir)/db2.in $(srcdir)/hto-mapfuncs.in $(srcdir)/ids.in \
+	$(srcdir)/portblock.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES = apache AudibleAlarm Delay db2 Filesystem \
+	hto-mapfuncs ICP ids IPaddr IPaddr2 IPsrcaddr IPv6addr \
+	LinuxSCSI LVM LVSSyncDaemonSwap MailTo OCF portblock Raid1 \
+	ServeRAID SendArp WAS WinPopup Xinetd
+am__installdirs = "$(DESTDIR)$(harddir)"
+hardSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(hard_SCRIPTS)
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +100,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +143,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +154,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +162,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +181,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +189,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +224,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +244,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +254,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +263,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +283,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +305,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +320,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # heartbeat: Linux-HA heartbeat code
@@ -361,11 +350,8 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 AM_CFLAGS = @CFLAGS@  @LIBNETDEFINES@
-
 MAINTAINERCLEANFILES = Makefile.in
-
 harddir = $(sysconfdir)/ha.d/resource.d
-
 hard_SCRIPTS = IPv6addr	\
 			apache		\
 			AudibleAlarm	\
@@ -391,90 +377,95 @@
 			WinPopup	\
 			Xinetd
 
-subdir = resources/heartbeat
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES = apache AudibleAlarm Delay db2 Filesystem \
-	hto-mapfuncs ICP ids IPaddr IPaddr2 IPsrcaddr IPv6addr \
-	LinuxSCSI LVM LVSSyncDaemonSwap MailTo OCF portblock Raid1 \
-	ServeRAID SendArp WAS WinPopup Xinetd
-SCRIPTS = $(hard_SCRIPTS)
-
-DIST_SOURCES =
-DIST_COMMON = $(srcdir)/Makefile.in AudibleAlarm.in Delay.in \
-	Filesystem.in ICP.in IPaddr.in IPaddr2.in IPsrcaddr.in \
-	IPv6addr.in LVM.in LVSSyncDaemonSwap.in LinuxSCSI.in MailTo.in \
-	Makefile.am OCF.in Raid1.in SendArp.in ServeRAID.in WAS.in \
-	WinPopup.in Xinetd.in apache.in db2.in hto-mapfuncs.in ids.in \
-	portblock.in
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  resources/heartbeat/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  resources/heartbeat/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-apache: $(top_builddir)/config.status apache.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+apache: $(top_builddir)/config.status $(srcdir)/apache.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-AudibleAlarm: $(top_builddir)/config.status AudibleAlarm.in
+AudibleAlarm: $(top_builddir)/config.status $(srcdir)/AudibleAlarm.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-Delay: $(top_builddir)/config.status Delay.in
+Delay: $(top_builddir)/config.status $(srcdir)/Delay.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-db2: $(top_builddir)/config.status db2.in
+db2: $(top_builddir)/config.status $(srcdir)/db2.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-Filesystem: $(top_builddir)/config.status Filesystem.in
+Filesystem: $(top_builddir)/config.status $(srcdir)/Filesystem.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-hto-mapfuncs: $(top_builddir)/config.status hto-mapfuncs.in
+hto-mapfuncs: $(top_builddir)/config.status $(srcdir)/hto-mapfuncs.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-ICP: $(top_builddir)/config.status ICP.in
+ICP: $(top_builddir)/config.status $(srcdir)/ICP.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-ids: $(top_builddir)/config.status ids.in
+ids: $(top_builddir)/config.status $(srcdir)/ids.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-IPaddr: $(top_builddir)/config.status IPaddr.in
+IPaddr: $(top_builddir)/config.status $(srcdir)/IPaddr.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-IPaddr2: $(top_builddir)/config.status IPaddr2.in
+IPaddr2: $(top_builddir)/config.status $(srcdir)/IPaddr2.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-IPsrcaddr: $(top_builddir)/config.status IPsrcaddr.in
+IPsrcaddr: $(top_builddir)/config.status $(srcdir)/IPsrcaddr.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-IPv6addr: $(top_builddir)/config.status IPv6addr.in
+IPv6addr: $(top_builddir)/config.status $(srcdir)/IPv6addr.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-LinuxSCSI: $(top_builddir)/config.status LinuxSCSI.in
+LinuxSCSI: $(top_builddir)/config.status $(srcdir)/LinuxSCSI.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-LVM: $(top_builddir)/config.status LVM.in
+LVM: $(top_builddir)/config.status $(srcdir)/LVM.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-LVSSyncDaemonSwap: $(top_builddir)/config.status LVSSyncDaemonSwap.in
+LVSSyncDaemonSwap: $(top_builddir)/config.status $(srcdir)/LVSSyncDaemonSwap.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-MailTo: $(top_builddir)/config.status MailTo.in
+MailTo: $(top_builddir)/config.status $(srcdir)/MailTo.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-OCF: $(top_builddir)/config.status OCF.in
+OCF: $(top_builddir)/config.status $(srcdir)/OCF.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-portblock: $(top_builddir)/config.status portblock.in
+portblock: $(top_builddir)/config.status $(srcdir)/portblock.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-Raid1: $(top_builddir)/config.status Raid1.in
+Raid1: $(top_builddir)/config.status $(srcdir)/Raid1.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-ServeRAID: $(top_builddir)/config.status ServeRAID.in
+ServeRAID: $(top_builddir)/config.status $(srcdir)/ServeRAID.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-SendArp: $(top_builddir)/config.status SendArp.in
+SendArp: $(top_builddir)/config.status $(srcdir)/SendArp.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-WAS: $(top_builddir)/config.status WAS.in
+WAS: $(top_builddir)/config.status $(srcdir)/WAS.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-WinPopup: $(top_builddir)/config.status WinPopup.in
+WinPopup: $(top_builddir)/config.status $(srcdir)/WinPopup.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-Xinetd: $(top_builddir)/config.status Xinetd.in
+Xinetd: $(top_builddir)/config.status $(srcdir)/Xinetd.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-hardSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 install-hardSCRIPTS: $(hard_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(harddir)
+	test -z "$(harddir)" || $(MKDIR_P) "$(DESTDIR)$(harddir)"
 	@list='$(hard_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(hardSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(harddir)/$$f"; \
-	    $(hardSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(harddir)/$$f; \
+	    echo " $(hardSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(harddir)/$$f'"; \
+	    $(hardSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(harddir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -482,8 +473,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(hard_SCRIPTS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f $(DESTDIR)$(harddir)/$$f"; \
-	  rm -f $(DESTDIR)$(harddir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(harddir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(harddir)/$$f"; \
 	done
 
 mostlyclean-libtool:
@@ -491,38 +482,29 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
 ctags: CTAGS
 CTAGS:
 
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -536,9 +518,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(SCRIPTS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(harddir)
+	for dir in "$(DESTDIR)$(harddir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -558,7 +541,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -570,24 +553,34 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-hardSCRIPTS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -606,17 +599,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-hardSCRIPTS uninstall-info-am
+uninstall-am: uninstall-hardSCRIPTS
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am \
-	install-hardSCRIPTS install-info install-info-am install-man \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-hardSCRIPTS install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-hardSCRIPTS uninstall-info-am
+	uninstall uninstall-am uninstall-hardSCRIPTS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/snmp_subagent/Makefile.in
+++ b/snmp_subagent/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -33,16 +33,13 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -54,39 +51,88 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+halib_PROGRAMS = hbagent$(EXEEXT)
+subdir = snmp_subagent
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/SNMPAgentSanityCheck.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES = SNMPAgentSanityCheck
+am__installdirs = "$(DESTDIR)$(halibdir)" "$(DESTDIR)$(testdir)" \
+	"$(DESTDIR)$(mibsdir)"
+halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(halib_PROGRAMS)
+am__objects_1 = hbagent.$(OBJEXT) hbagentv2.$(OBJEXT) \
+	LHANodeTable.$(OBJEXT) LHAClusterInfo.$(OBJEXT) \
+	LHAIFStatusTable.$(OBJEXT) LHAMembershipTable.$(OBJEXT) \
+	LHAHeartbeatConfigInfo.$(OBJEXT) \
+	LHAResourceGroupTable.$(OBJEXT) LHAResourceTable.$(OBJEXT) \
+	LHAResourceStatusUpdate.$(OBJEXT)
+am_hbagent_OBJECTS = $(am__objects_1)
+hbagent_OBJECTS = $(am_hbagent_OBJECTS)
+am__DEPENDENCIES_1 =
+hbagent_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
+	$(top_builddir)/lib/hbclient/libhbclient.la \
+	$(top_builddir)/lib/crm/common/libcrmcommon.la \
+	$(top_builddir)/lib/crm/cib/libcib.la \
+	$(top_builddir)/lib//crm/pengine/libpe_status.la \
+	$(top_builddir)/membership/ccm/libccmclient.la \
+	$(top_builddir)/membership/ccm/libclm.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+hbagent_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(hbagent_LDFLAGS) \
+	$(LDFLAGS) -o $@
+testSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(test_SCRIPTS)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(hbagent_SOURCES)
+DIST_SOURCES = $(hbagent_SOURCES)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+mibsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(mibs_DATA)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -109,8 +155,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -154,8 +198,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -167,6 +209,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -174,12 +217,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -197,8 +236,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -207,15 +244,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -245,8 +279,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -267,8 +299,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -279,20 +309,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -300,17 +318,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -318,6 +338,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -339,6 +360,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -353,15 +375,16 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 MAINTAINERCLEANFILES = Makefile.in
-
 hbagent_srces = snmp-config-resolve.h	\
 	hbagent.h			\
 	hbagent.c			\
@@ -394,27 +417,17 @@
 	LHAResourceStatusUpdate.h \
 	LHAResourceStatusUpdate.c 
 
-
 test_scrs = SNMPAgentSanityCheck
-
 mibsdir = @MIBS_DIR@
 mibs_DATA = LINUX-HA-MIB.mib
 DIST_LIST = SNMPAgentSanityCheck.in $(mibs_DATA)
-
 EXTRA_DIST = $(DIST_LIST)
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
 			-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha  \
 			-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
 
-
 halibdir = $(libdir)/@HB_PKG@
-
-# binary programs
-halib_PROGRAMS = hbagent 
-
 hbagent_SOURCES = $(hbagent_srces)
-
 hbagent_LDADD = \
                         $(top_builddir)/lib/clplumbing/libplumb.la \
 			$(top_builddir)/lib/hbclient/libhbclient.la \
@@ -426,92 +439,59 @@
 			$(CURSESLIBS) \
 			$(GLIBLIB)
 
-
 hbagent_LDFLAGS = @SNMPAGENTLIB@ 
 
 # test cases
 testdir = $(HA_NOARCHDATAHBDIR)
 test_SCRIPTS = $(test_scrs)
-
 hadir = $(sysconfdir)/ha.d
-
 AM_CFLAGS = @CFLAGS@
-subdir = snmp_subagent
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES = SNMPAgentSanityCheck
-halib_PROGRAMS = hbagent$(EXEEXT)
-PROGRAMS = $(halib_PROGRAMS)
-
-am__objects_1 = hbagent.$(OBJEXT) hbagentv2.$(OBJEXT) \
-	LHANodeTable.$(OBJEXT) LHAClusterInfo.$(OBJEXT) \
-	LHAIFStatusTable.$(OBJEXT) LHAMembershipTable.$(OBJEXT) \
-	LHAHeartbeatConfigInfo.$(OBJEXT) \
-	LHAResourceGroupTable.$(OBJEXT) LHAResourceTable.$(OBJEXT) \
-	LHAResourceStatusUpdate.$(OBJEXT)
-am_hbagent_OBJECTS = $(am__objects_1)
-hbagent_OBJECTS = $(am_hbagent_OBJECTS)
-hbagent_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/hbclient/libhbclient.la \
-	$(top_builddir)/lib/crm/common/libcrmcommon.la \
-	$(top_builddir)/lib/crm/cib/libcib.la \
-	$(top_builddir)/lib//crm/pengine/libpe_status.la \
-	$(top_builddir)/membership/ccm/libccmclient.la \
-	$(top_builddir)/membership/ccm/libclm.la
-SCRIPTS = $(test_SCRIPTS)
-
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/LHAClusterInfo.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/LHAHeartbeatConfigInfo.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/LHAIFStatusTable.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/LHAMembershipTable.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/LHANodeTable.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/LHAResourceGroupTable.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/LHAResourceStatusUpdate.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/LHAResourceTable.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/hbagent.Po ./$(DEPDIR)/hbagentv2.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(hbagent_SOURCES)
-DATA = $(mibs_DATA)
-
-DIST_COMMON = README $(srcdir)/Makefile.in Makefile.am \
-	SNMPAgentSanityCheck.in
-SOURCES = $(hbagent_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  snmp_subagent/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  snmp_subagent/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-SNMPAgentSanityCheck: $(top_builddir)/config.status SNMPAgentSanityCheck.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+SNMPAgentSanityCheck: $(top_builddir)/config.status $(srcdir)/SNMPAgentSanityCheck.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-halibPROGRAMS: $(halib_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	test -z "$(halibdir)" || $(MKDIR_P) "$(DESTDIR)$(halibdir)"
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -519,8 +499,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(halibdir)/$$f"; \
-	  rm -f $(DESTDIR)$(halibdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(halibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(halibdir)/$$f"; \
 	done
 
 clean-halibPROGRAMS:
@@ -531,17 +511,16 @@
 	done
 hbagent$(EXEEXT): $(hbagent_OBJECTS) $(hbagent_DEPENDENCIES) 
 	@rm -f hbagent$(EXEEXT)
-	$(LINK) $(hbagent_LDFLAGS) $(hbagent_OBJECTS) $(hbagent_LDADD) $(LIBS)
-testSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+	$(hbagent_LINK) $(hbagent_OBJECTS) $(hbagent_LDADD) $(LIBS)
 install-testSCRIPTS: $(test_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(testdir)
+	test -z "$(testdir)" || $(MKDIR_P) "$(DESTDIR)$(testdir)"
 	@list='$(test_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(testSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(testdir)/$$f"; \
-	    $(testSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(testdir)/$$f; \
+	    echo " $(testSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(testdir)/$$f'"; \
+	    $(testSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(testdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -549,12 +528,12 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(test_SCRIPTS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f $(DESTDIR)$(testdir)/$$f"; \
-	  rm -f $(DESTDIR)$(testdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(testdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(testdir)/$$f"; \
 	done
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -571,74 +550,49 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hbagentv2.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-mibsDATA_INSTALL = $(INSTALL_DATA)
 install-mibsDATA: $(mibs_DATA)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(mibsdir)
+	test -z "$(mibsdir)" || $(MKDIR_P) "$(DESTDIR)$(mibsdir)"
 	@list='$(mibs_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(mibsDATA_INSTALL) $$d$$p $(DESTDIR)$(mibsdir)/$$f"; \
-	  $(mibsDATA_INSTALL) $$d$$p $(DESTDIR)$(mibsdir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " $(mibsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mibsdir)/$$f'"; \
+	  $(mibsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mibsdir)/$$f"; \
 	done
 
 uninstall-mibsDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(mibs_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(mibsdir)/$$f"; \
-	  rm -f $(DESTDIR)$(mibsdir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(mibsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(mibsdir)/$$f"; \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -647,6 +601,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -658,10 +613,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -684,28 +640,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -719,9 +670,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(halibdir) $(DESTDIR)$(testdir) $(DESTDIR)$(mibsdir)
+	for dir in "$(DESTDIR)$(halibdir)" "$(DESTDIR)$(testdir)" "$(DESTDIR)$(mibsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -741,7 +693,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -749,18 +701,21 @@
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
-clean-am: clean-generic clean-halibPROGRAMS clean-libtool mostlyclean-am
+clean-am: clean-generic clean-halibPROGRAMS clean-libtool \
+	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -768,12 +723,20 @@
 install-data-am: install-halibPROGRAMS install-mibsDATA \
 	install-testSCRIPTS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -794,21 +757,25 @@
 
 ps-am:
 
-uninstall-am: uninstall-halibPROGRAMS uninstall-info-am \
-	uninstall-mibsDATA uninstall-testSCRIPTS
+uninstall-am: uninstall-halibPROGRAMS uninstall-mibsDATA \
+	uninstall-testSCRIPTS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-halibPROGRAMS clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-halibPROGRAMS install-info \
-	install-info-am install-man install-mibsDATA install-strip \
-	install-testSCRIPTS installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
-	pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-halibPROGRAMS uninstall-info-am uninstall-mibsDATA \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am \
+	install-halibPROGRAMS install-html install-html-am \
+	install-info install-info-am install-man install-mibsDATA \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip install-testSCRIPTS installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-halibPROGRAMS uninstall-mibsDATA \
 	uninstall-testSCRIPTS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/telecom/Makefile.in
+++ b/telecom/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,17 +13,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +29,49 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+subdir = telecom
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +94,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +137,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +148,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +156,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +175,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +183,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +218,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +238,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +248,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +257,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +277,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +299,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +314,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # heartbeat telecom directory: Linux-HA code
@@ -361,31 +344,40 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 SUBDIRS = apphbd recoverymgrd
 DIST_SUBDIRS = apphbd recoverymgrd
-subdir = telecom
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
 all: all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  telecom/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  telecom/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -393,10 +385,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -404,7 +392,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -416,15 +410,20 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -445,7 +444,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -456,14 +455,6 @@
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -472,19 +463,22 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -494,10 +488,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -520,28 +515,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -554,13 +544,17 @@
 	done
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -570,7 +564,6 @@
 all-am: Makefile
 installdirs: installdirs-recursive
 installdirs-am:
-
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -590,7 +583,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -602,25 +595,34 @@
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
+html: html-recursive
+
 info: info-recursive
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -639,26 +641,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
-	install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
-	install-recursive install-strip installcheck installcheck-am \
-	installdirs installdirs-am installdirs-recursive \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-recursive
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/telecom/apphbd/Makefile.in
+++ b/telecom/apphbd/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +30,73 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+halib_PROGRAMS = apphbd$(EXEEXT) apphbtest$(EXEEXT)
+subdir = telecom/apphbd
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(halibdir)"
+halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(halib_PROGRAMS)
+am_apphbd_OBJECTS = apphbd.$(OBJEXT)
+apphbd_OBJECTS = $(am_apphbd_OBJECTS)
+am__DEPENDENCIES_1 =
+am__DEPENDENCIES_2 = $(top_builddir)/lib/clplumbing/libplumb.la \
+	$(am__DEPENDENCIES_1) $(top_builddir)/lib/pils/libpils.la
+apphbd_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	$(top_builddir)/lib/pils/libpils.la $(am__DEPENDENCIES_1)
+apphbd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(apphbd_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_apphbtest_OBJECTS = apphbtest.$(OBJEXT)
+apphbtest_OBJECTS = $(am_apphbtest_OBJECTS)
+apphbtest_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	$(top_builddir)/lib/apphb/libapphb.la
+apphbtest_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(apphbtest_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(apphbd_SOURCES) $(apphbtest_SOURCES)
+DIST_SOURCES = $(apphbd_SOURCES) $(apphbtest_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +119,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +162,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +173,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +181,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -173,14 +195,11 @@
 LIBNETDEFINES = @LIBNETDEFINES@
 LIBNETLIBS = @LIBNETLIBS@
 LIBOBJS = @LIBOBJS@
-
 LIBRT = @LIBRT@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -189,15 +208,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -227,8 +243,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -249,8 +263,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -261,20 +273,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -282,17 +282,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -300,6 +302,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -321,6 +324,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -335,12 +339,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # heartbeat: Linux-HA telecom code: application heartbeat daemon
@@ -362,18 +369,15 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
 			-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 			-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha
 
-
 hadir = $(sysconfdir)/ha.d
 halibdir = $(libdir)/@HB_PKG@
 commmoddir = $(halibdir)/modules/comm
 havarlibdir = $(localstatedir)/lib/@HB_PKG@
 PIDFILE = $(localstatedir)/run/apphbd.pid
-
 COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la	\
 			$(GLIBLIB)					\
 			$(top_builddir)/lib/pils/libpils.la
@@ -381,9 +385,6 @@
 AM_CFLAGS = @CFLAGS@	\
 			-DPIDFILE='"$(PIDFILE)"'
 
-
-halib_PROGRAMS = apphbd apphbtest
-
 apphbd_SOURCES = apphbd.c
 #
 #	We don't really need libpils/libltdl (yet...)
@@ -392,71 +393,56 @@
 			$(top_builddir)/lib/pils/libpils.la		\
 			@LIBLTDL@ $(LIBRT)				
 
-
 apphbd_LDFLAGS = @LIBADD_DL@ @LIBLTDL@ -export-dynamic	@DLOPEN_FORCE_FLAGS@
-
 apphbtest_SOURCES = apphbtest.c
 apphbtest_LDADD = $(COMMONLIBS) 				\
 			$(top_builddir)/lib/apphb/libapphb.la		
 
-
 apphbtest_LDFLAGS = 
-subdir = telecom/apphbd
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-halib_PROGRAMS = apphbd$(EXEEXT) apphbtest$(EXEEXT)
-PROGRAMS = $(halib_PROGRAMS)
-
-am_apphbd_OBJECTS = apphbd.$(OBJEXT)
-apphbd_OBJECTS = $(am_apphbd_OBJECTS)
-apphbd_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/pils/libpils.la \
-	$(top_builddir)/lib/pils/libpils.la
-am_apphbtest_OBJECTS = apphbtest.$(OBJEXT)
-apphbtest_OBJECTS = $(am_apphbtest_OBJECTS)
-apphbtest_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/pils/libpils.la \
-	$(top_builddir)/lib/apphb/libapphb.la
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/apphbd.Po ./$(DEPDIR)/apphbtest.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(apphbd_SOURCES) $(apphbtest_SOURCES)
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(apphbd_SOURCES) $(apphbtest_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  telecom/apphbd/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  telecom/apphbd/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-halibPROGRAMS: $(halib_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	test -z "$(halibdir)" || $(MKDIR_P) "$(DESTDIR)$(halibdir)"
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -464,8 +450,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(halibdir)/$$f"; \
-	  rm -f $(DESTDIR)$(halibdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(halibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(halibdir)/$$f"; \
 	done
 
 clean-halibPROGRAMS:
@@ -476,13 +462,13 @@
 	done
 apphbd$(EXEEXT): $(apphbd_OBJECTS) $(apphbd_DEPENDENCIES) 
 	@rm -f apphbd$(EXEEXT)
-	$(LINK) $(apphbd_LDFLAGS) $(apphbd_OBJECTS) $(apphbd_LDADD) $(LIBS)
+	$(apphbd_LINK) $(apphbd_OBJECTS) $(apphbd_LDADD) $(LIBS)
 apphbtest$(EXEEXT): $(apphbtest_OBJECTS) $(apphbtest_DEPENDENCIES) 
 	@rm -f apphbtest$(EXEEXT)
-	$(LINK) $(apphbtest_LDFLAGS) $(apphbtest_OBJECTS) $(apphbtest_LDADD) $(LIBS)
+	$(apphbtest_LINK) $(apphbtest_OBJECTS) $(apphbtest_LDADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -491,37 +477,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/apphbtest.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -529,18 +503,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -549,6 +511,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -560,10 +523,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -586,28 +550,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -621,9 +580,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	for dir in "$(DESTDIR)$(halibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -643,7 +603,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -651,30 +611,41 @@
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
-clean-am: clean-generic clean-halibPROGRAMS clean-libtool mostlyclean-am
+clean-am: clean-generic clean-halibPROGRAMS clean-libtool \
+	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-halibPROGRAMS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -695,20 +666,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-halibPROGRAMS uninstall-info-am
+uninstall-am: uninstall-halibPROGRAMS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-halibPROGRAMS clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-halibPROGRAMS install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am \
+	install-halibPROGRAMS install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-halibPROGRAMS \
-	uninstall-info-am
+	tags uninstall uninstall-am uninstall-halibPROGRAMS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/telecom/recoverymgrd/Makefile.in
+++ b/telecom/recoverymgrd/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,12 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +31,78 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+halib_PROGRAMS = recoverymgrd$(EXEEXT)
+subdir = telecom/recoverymgrd
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in conf_lex.c conf_yacc.c conf_yacc.h
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(halibdir)"
+halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(halib_PROGRAMS)
+am_recoverymgrd_OBJECTS = recoverymgrd-conf_yacc.$(OBJEXT) \
+	recoverymgrd-conf_lex.$(OBJEXT) \
+	recoverymgrd-recoverymgrd.$(OBJEXT)
+recoverymgrd_OBJECTS = $(am_recoverymgrd_OBJECTS)
+am__DEPENDENCIES_1 =
+am__DEPENDENCIES_2 = $(top_builddir)/lib/clplumbing/libplumb.la \
+	$(am__DEPENDENCIES_1)
+recoverymgrd_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	$(top_builddir)/lib/pils/libpils.la \
+	$(top_builddir)/lib/apphb/libapphb.la $(am__DEPENDENCIES_1)
+recoverymgrd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(recoverymgrd_CFLAGS) \
+	$(CFLAGS) $(recoverymgrd_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
+LTLEXCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
+YLWRAP = $(top_srcdir)/ylwrap
+YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
+LTYACCCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS)
+SOURCES = $(recoverymgrd_SOURCES)
+DIST_SOURCES = $(recoverymgrd_SOURCES)
+HEADERS = $(noinst_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +125,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +168,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +179,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +187,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -173,14 +201,11 @@
 LIBNETDEFINES = @LIBNETDEFINES@
 LIBNETLIBS = @LIBNETLIBS@
 LIBOBJS = @LIBOBJS@
-
 LIBRT = @LIBRT@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -189,15 +214,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -227,8 +249,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -249,8 +269,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -261,20 +279,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -282,17 +288,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -300,6 +308,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -321,6 +330,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -335,12 +345,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # heartbeat: Linux-HA telecom code: sample recovery manager daemon
@@ -362,19 +375,15 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
 CLEANFILES = conf_lex.c  conf_yacc.c  conf_yacc.h
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
 			-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
 			-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha
 
-
 hadir = $(sysconfdir)/ha.d
 halibdir = $(libdir)/@HB_PKG@
 commmoddir = $(halibdir)/modules/comm
 havarlibdir = $(localstatedir)/lib/@HB_PKG@
-
 COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la	\
 			$(GLIBLIB)
 
@@ -394,82 +403,59 @@
 #	these comments or turn off warnings *again*, let's discuss this.
 #
 AM_YFLAGS = -d
-
-halib_PROGRAMS = recoverymgrd
-
 recoverymgrd_SOURCES = conf_yacc.y conf_lex.l recoverymgrd.c
 noinst_HEADERS = recoverymgrd.h configfile.h conf_yacc.h
-
 recoverymgrd_CFLAGS = $(AM_CFLAGS)
 recoverymgrd_LDADD = $(COMMONLIBS) 				\
 			$(top_builddir)/lib/pils/libpils.la		\
 			$(top_builddir)/lib/apphb/libapphb.la		\
 			$(LIBRT)
 
-
 recoverymgrd_LDFLAGS = @LIBADD_DL@ @LIBLTDL@ -export-dynamic @DLOPEN_FORCE_FLAGS@
-subdir = telecom/recoverymgrd
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES =
-halib_PROGRAMS = recoverymgrd$(EXEEXT)
-PROGRAMS = $(halib_PROGRAMS)
-
-am_recoverymgrd_OBJECTS = recoverymgrd-conf_yacc.$(OBJEXT) \
-	recoverymgrd-conf_lex.$(OBJEXT) \
-	recoverymgrd-recoverymgrd.$(OBJEXT)
-recoverymgrd_OBJECTS = $(am_recoverymgrd_OBJECTS)
-recoverymgrd_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/pils/libpils.la \
-	$(top_builddir)/lib/apphb/libapphb.la
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/recoverymgrd-conf_lex.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/recoverymgrd-conf_yacc.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/recoverymgrd-recoverymgrd.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
-LTLEXCOMPILE = $(LIBTOOL) --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
-YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
-LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS)
-DIST_SOURCES = $(recoverymgrd_SOURCES)
-HEADERS = $(noinst_HEADERS)
-
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am \
-	conf_lex.c conf_yacc.c conf_yacc.h
-SOURCES = $(recoverymgrd_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .l .lo .o .obj .y
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  telecom/recoverymgrd/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  telecom/recoverymgrd/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-halibPROGRAMS: $(halib_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	test -z "$(halibdir)" || $(MKDIR_P) "$(DESTDIR)$(halibdir)"
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -477,8 +463,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(halibdir)/$$f"; \
-	  rm -f $(DESTDIR)$(halibdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(halibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(halibdir)/$$f"; \
 	done
 
 clean-halibPROGRAMS:
@@ -490,14 +476,14 @@
 conf_yacc.h: conf_yacc.c
 	@if test ! -f $@; then \
 	  rm -f conf_yacc.c; \
-	  $(MAKE) conf_yacc.c; \
+	  $(MAKE) $(AM_MAKEFLAGS) conf_yacc.c; \
 	else :; fi
 recoverymgrd$(EXEEXT): $(recoverymgrd_OBJECTS) $(recoverymgrd_DEPENDENCIES) 
 	@rm -f recoverymgrd$(EXEEXT)
-	$(LINK) $(recoverymgrd_LDFLAGS) $(recoverymgrd_OBJECTS) $(recoverymgrd_LDADD) $(LIBS)
+	$(recoverymgrd_LINK) $(recoverymgrd_OBJECTS) $(recoverymgrd_LDADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -507,161 +493,73 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recoverymgrd-recoverymgrd.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 recoverymgrd-conf_yacc.o: conf_yacc.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(recoverymgrd_CFLAGS) $(CFLAGS) -MT recoverymgrd-conf_yacc.o -MD -MP -MF "$(DEPDIR)/recoverymgrd-conf_yacc.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o recoverymgrd-conf_yacc.o `test -f 'conf_yacc.c' || echo '$(srcdir)/'`conf_yacc.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/recoverymgrd-conf_yacc.Tpo" "$(DEPDIR)/recoverymgrd-conf_yacc.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/recoverymgrd-conf_yacc.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(recoverymgrd_CFLAGS) $(CFLAGS) -MT recoverymgrd-conf_yacc.o -MD -MP -MF $(DEPDIR)/recoverymgrd-conf_yacc.Tpo -c -o recoverymgrd-conf_yacc.o `test -f 'conf_yacc.c' || echo '$(srcdir)/'`conf_yacc.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/recoverymgrd-conf_yacc.Tpo $(DEPDIR)/recoverymgrd-conf_yacc.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='conf_yacc.c' object='recoverymgrd-conf_yacc.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/recoverymgrd-conf_yacc.Po' tmpdepfile='$(DEPDIR)/recoverymgrd-conf_yacc.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(recoverymgrd_CFLAGS) $(CFLAGS) -c -o recoverymgrd-conf_yacc.o `test -f 'conf_yacc.c' || echo '$(srcdir)/'`conf_yacc.c
 
 recoverymgrd-conf_yacc.obj: conf_yacc.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(recoverymgrd_CFLAGS) $(CFLAGS) -MT recoverymgrd-conf_yacc.obj -MD -MP -MF "$(DEPDIR)/recoverymgrd-conf_yacc.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o recoverymgrd-conf_yacc.obj `if test -f 'conf_yacc.c'; then $(CYGPATH_W) 'conf_yacc.c'; else $(CYGPATH_W) '$(srcdir)/conf_yacc.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/recoverymgrd-conf_yacc.Tpo" "$(DEPDIR)/recoverymgrd-conf_yacc.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/recoverymgrd-conf_yacc.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(recoverymgrd_CFLAGS) $(CFLAGS) -MT recoverymgrd-conf_yacc.obj -MD -MP -MF $(DEPDIR)/recoverymgrd-conf_yacc.Tpo -c -o recoverymgrd-conf_yacc.obj `if test -f 'conf_yacc.c'; then $(CYGPATH_W) 'conf_yacc.c'; else $(CYGPATH_W) '$(srcdir)/conf_yacc.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/recoverymgrd-conf_yacc.Tpo $(DEPDIR)/recoverymgrd-conf_yacc.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='conf_yacc.c' object='recoverymgrd-conf_yacc.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/recoverymgrd-conf_yacc.Po' tmpdepfile='$(DEPDIR)/recoverymgrd-conf_yacc.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(recoverymgrd_CFLAGS) $(CFLAGS) -c -o recoverymgrd-conf_yacc.obj `if test -f 'conf_yacc.c'; then $(CYGPATH_W) 'conf_yacc.c'; else $(CYGPATH_W) '$(srcdir)/conf_yacc.c'; fi`
 
-recoverymgrd-conf_yacc.lo: conf_yacc.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(recoverymgrd_CFLAGS) $(CFLAGS) -MT recoverymgrd-conf_yacc.lo -MD -MP -MF "$(DEPDIR)/recoverymgrd-conf_yacc.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o recoverymgrd-conf_yacc.lo `test -f 'conf_yacc.c' || echo '$(srcdir)/'`conf_yacc.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/recoverymgrd-conf_yacc.Tpo" "$(DEPDIR)/recoverymgrd-conf_yacc.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/recoverymgrd-conf_yacc.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='conf_yacc.c' object='recoverymgrd-conf_yacc.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/recoverymgrd-conf_yacc.Plo' tmpdepfile='$(DEPDIR)/recoverymgrd-conf_yacc.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(recoverymgrd_CFLAGS) $(CFLAGS) -c -o recoverymgrd-conf_yacc.lo `test -f 'conf_yacc.c' || echo '$(srcdir)/'`conf_yacc.c
-
 recoverymgrd-conf_lex.o: conf_lex.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(recoverymgrd_CFLAGS) $(CFLAGS) -MT recoverymgrd-conf_lex.o -MD -MP -MF "$(DEPDIR)/recoverymgrd-conf_lex.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o recoverymgrd-conf_lex.o `test -f 'conf_lex.c' || echo '$(srcdir)/'`conf_lex.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/recoverymgrd-conf_lex.Tpo" "$(DEPDIR)/recoverymgrd-conf_lex.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/recoverymgrd-conf_lex.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(recoverymgrd_CFLAGS) $(CFLAGS) -MT recoverymgrd-conf_lex.o -MD -MP -MF $(DEPDIR)/recoverymgrd-conf_lex.Tpo -c -o recoverymgrd-conf_lex.o `test -f 'conf_lex.c' || echo '$(srcdir)/'`conf_lex.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/recoverymgrd-conf_lex.Tpo $(DEPDIR)/recoverymgrd-conf_lex.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='conf_lex.c' object='recoverymgrd-conf_lex.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/recoverymgrd-conf_lex.Po' tmpdepfile='$(DEPDIR)/recoverymgrd-conf_lex.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(recoverymgrd_CFLAGS) $(CFLAGS) -c -o recoverymgrd-conf_lex.o `test -f 'conf_lex.c' || echo '$(srcdir)/'`conf_lex.c
 
 recoverymgrd-conf_lex.obj: conf_lex.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(recoverymgrd_CFLAGS) $(CFLAGS) -MT recoverymgrd-conf_lex.obj -MD -MP -MF "$(DEPDIR)/recoverymgrd-conf_lex.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o recoverymgrd-conf_lex.obj `if test -f 'conf_lex.c'; then $(CYGPATH_W) 'conf_lex.c'; else $(CYGPATH_W) '$(srcdir)/conf_lex.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/recoverymgrd-conf_lex.Tpo" "$(DEPDIR)/recoverymgrd-conf_lex.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/recoverymgrd-conf_lex.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(recoverymgrd_CFLAGS) $(CFLAGS) -MT recoverymgrd-conf_lex.obj -MD -MP -MF $(DEPDIR)/recoverymgrd-conf_lex.Tpo -c -o recoverymgrd-conf_lex.obj `if test -f 'conf_lex.c'; then $(CYGPATH_W) 'conf_lex.c'; else $(CYGPATH_W) '$(srcdir)/conf_lex.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/recoverymgrd-conf_lex.Tpo $(DEPDIR)/recoverymgrd-conf_lex.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='conf_lex.c' object='recoverymgrd-conf_lex.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/recoverymgrd-conf_lex.Po' tmpdepfile='$(DEPDIR)/recoverymgrd-conf_lex.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(recoverymgrd_CFLAGS) $(CFLAGS) -c -o recoverymgrd-conf_lex.obj `if test -f 'conf_lex.c'; then $(CYGPATH_W) 'conf_lex.c'; else $(CYGPATH_W) '$(srcdir)/conf_lex.c'; fi`
 
-recoverymgrd-conf_lex.lo: conf_lex.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(recoverymgrd_CFLAGS) $(CFLAGS) -MT recoverymgrd-conf_lex.lo -MD -MP -MF "$(DEPDIR)/recoverymgrd-conf_lex.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o recoverymgrd-conf_lex.lo `test -f 'conf_lex.c' || echo '$(srcdir)/'`conf_lex.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/recoverymgrd-conf_lex.Tpo" "$(DEPDIR)/recoverymgrd-conf_lex.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/recoverymgrd-conf_lex.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='conf_lex.c' object='recoverymgrd-conf_lex.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/recoverymgrd-conf_lex.Plo' tmpdepfile='$(DEPDIR)/recoverymgrd-conf_lex.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(recoverymgrd_CFLAGS) $(CFLAGS) -c -o recoverymgrd-conf_lex.lo `test -f 'conf_lex.c' || echo '$(srcdir)/'`conf_lex.c
-
 recoverymgrd-recoverymgrd.o: recoverymgrd.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(recoverymgrd_CFLAGS) $(CFLAGS) -MT recoverymgrd-recoverymgrd.o -MD -MP -MF "$(DEPDIR)/recoverymgrd-recoverymgrd.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o recoverymgrd-recoverymgrd.o `test -f 'recoverymgrd.c' || echo '$(srcdir)/'`recoverymgrd.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/recoverymgrd-recoverymgrd.Tpo" "$(DEPDIR)/recoverymgrd-recoverymgrd.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/recoverymgrd-recoverymgrd.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(recoverymgrd_CFLAGS) $(CFLAGS) -MT recoverymgrd-recoverymgrd.o -MD -MP -MF $(DEPDIR)/recoverymgrd-recoverymgrd.Tpo -c -o recoverymgrd-recoverymgrd.o `test -f 'recoverymgrd.c' || echo '$(srcdir)/'`recoverymgrd.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/recoverymgrd-recoverymgrd.Tpo $(DEPDIR)/recoverymgrd-recoverymgrd.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='recoverymgrd.c' object='recoverymgrd-recoverymgrd.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/recoverymgrd-recoverymgrd.Po' tmpdepfile='$(DEPDIR)/recoverymgrd-recoverymgrd.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(recoverymgrd_CFLAGS) $(CFLAGS) -c -o recoverymgrd-recoverymgrd.o `test -f 'recoverymgrd.c' || echo '$(srcdir)/'`recoverymgrd.c
 
 recoverymgrd-recoverymgrd.obj: recoverymgrd.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(recoverymgrd_CFLAGS) $(CFLAGS) -MT recoverymgrd-recoverymgrd.obj -MD -MP -MF "$(DEPDIR)/recoverymgrd-recoverymgrd.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o recoverymgrd-recoverymgrd.obj `if test -f 'recoverymgrd.c'; then $(CYGPATH_W) 'recoverymgrd.c'; else $(CYGPATH_W) '$(srcdir)/recoverymgrd.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/recoverymgrd-recoverymgrd.Tpo" "$(DEPDIR)/recoverymgrd-recoverymgrd.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/recoverymgrd-recoverymgrd.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(recoverymgrd_CFLAGS) $(CFLAGS) -MT recoverymgrd-recoverymgrd.obj -MD -MP -MF $(DEPDIR)/recoverymgrd-recoverymgrd.Tpo -c -o recoverymgrd-recoverymgrd.obj `if test -f 'recoverymgrd.c'; then $(CYGPATH_W) 'recoverymgrd.c'; else $(CYGPATH_W) '$(srcdir)/recoverymgrd.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/recoverymgrd-recoverymgrd.Tpo $(DEPDIR)/recoverymgrd-recoverymgrd.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='recoverymgrd.c' object='recoverymgrd-recoverymgrd.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/recoverymgrd-recoverymgrd.Po' tmpdepfile='$(DEPDIR)/recoverymgrd-recoverymgrd.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(recoverymgrd_CFLAGS) $(CFLAGS) -c -o recoverymgrd-recoverymgrd.obj `if test -f 'recoverymgrd.c'; then $(CYGPATH_W) 'recoverymgrd.c'; else $(CYGPATH_W) '$(srcdir)/recoverymgrd.c'; fi`
 
-recoverymgrd-recoverymgrd.lo: recoverymgrd.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(recoverymgrd_CFLAGS) $(CFLAGS) -MT recoverymgrd-recoverymgrd.lo -MD -MP -MF "$(DEPDIR)/recoverymgrd-recoverymgrd.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o recoverymgrd-recoverymgrd.lo `test -f 'recoverymgrd.c' || echo '$(srcdir)/'`recoverymgrd.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/recoverymgrd-recoverymgrd.Tpo" "$(DEPDIR)/recoverymgrd-recoverymgrd.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/recoverymgrd-recoverymgrd.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='recoverymgrd.c' object='recoverymgrd-recoverymgrd.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/recoverymgrd-recoverymgrd.Plo' tmpdepfile='$(DEPDIR)/recoverymgrd-recoverymgrd.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(recoverymgrd_CFLAGS) $(CFLAGS) -c -o recoverymgrd-recoverymgrd.lo `test -f 'recoverymgrd.c' || echo '$(srcdir)/'`recoverymgrd.c
-
 .l.c:
-	$(LEXCOMPILE) `test -f $< || echo '$(srcdir)/'`$<
-	sed '/^#/ s|$(LEX_OUTPUT_ROOT)\.c|$@|' $(LEX_OUTPUT_ROOT).c >$@
-	rm -f $(LEX_OUTPUT_ROOT).c
+	$(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
 
 .y.c:
-	$(YACCCOMPILE) `test -f '$<' || echo '$(srcdir)/'`$<
-	if test -f y.tab.h; then \
-	  to=`echo "$*_H" | sed \
-                -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \
-                -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \
-	  sed "/^#/ s/Y_TAB_H/$$to/g" y.tab.h >$*.ht; \
-	  rm -f y.tab.h; \
-	  if cmp -s $*.ht $*.h; then \
-	    rm -f $*.ht ;\
-	  else \
-	    mv $*.ht $*.h; \
-	  fi; \
-	fi
-	if test -f y.output; then \
-	  mv y.output $*.output; \
-	fi
-	sed '/^#/ s|y\.tab\.c|$@|' y.tab.c >$@t && mv $@t $@
-	rm -f y.tab.c
+	$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE)
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -669,18 +567,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -689,6 +575,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -700,10 +587,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -726,28 +614,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -761,9 +644,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(HEADERS)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	for dir in "$(DESTDIR)$(halibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -784,41 +668,52 @@
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 	-rm -f conf_lex.c
 	-rm -f conf_yacc.c
 	-rm -f conf_yacc.h
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
-clean-am: clean-generic clean-halibPROGRAMS clean-libtool mostlyclean-am
+clean-am: clean-generic clean-halibPROGRAMS clean-libtool \
+	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
 
 install-data-am: install-halibPROGRAMS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -839,20 +734,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-halibPROGRAMS uninstall-info-am
+uninstall-am: uninstall-halibPROGRAMS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-halibPROGRAMS clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-halibPROGRAMS install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am \
+	install-halibPROGRAMS install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-halibPROGRAMS \
-	uninstall-info-am
+	tags uninstall uninstall-am uninstall-halibPROGRAMS
 
 
 conf_lex.c: conf_yacc.h
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,16 +14,13 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,39 +32,104 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+habin_PROGRAMS = cl_status$(EXEEXT) cl_respawn$(EXEEXT)
+@CRM_BUILD_TRUE@halib_PROGRAMS = attrd$(EXEEXT) pingd$(EXEEXT)
+@CRM_BUILD_TRUE@sbin_PROGRAMS = attrd_updater$(EXEEXT)
+subdir = tools
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/ciblint.in $(srcdir)/haresources2cib.py.in \
+	$(srcdir)/hb_report.in $(srcdir)/ocf-tester.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES = ciblint haresources2cib.py hb_report ocf-tester
+am__installdirs = "$(DESTDIR)$(habindir)" "$(DESTDIR)$(halibdir)" \
+	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(halibdir)" \
+	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(hanoarchdir)"
+habinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(habin_PROGRAMS) $(halib_PROGRAMS) $(sbin_PROGRAMS)
+am_attrd_OBJECTS = attrd.$(OBJEXT)
+attrd_OBJECTS = $(am_attrd_OBJECTS)
+am__DEPENDENCIES_1 =
+attrd_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
+	$(top_builddir)/lib/crm/common/libcrmcommon.la \
+	$(top_builddir)/lib/hbclient/libhbclient.la \
+	$(top_builddir)/lib/crm/cib/libcib.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+am_attrd_updater_OBJECTS = attrd_updater.$(OBJEXT)
+attrd_updater_OBJECTS = $(am_attrd_updater_OBJECTS)
+attrd_updater_DEPENDENCIES =  \
+	$(top_builddir)/lib/clplumbing/libplumb.la \
+	$(top_builddir)/lib/crm/common/libcrmcommon.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am_cl_respawn_OBJECTS = cl_respawn.$(OBJEXT)
+cl_respawn_OBJECTS = $(am_cl_respawn_OBJECTS)
+cl_respawn_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
+	$(top_builddir)/lib/apphb/libapphb.la $(am__DEPENDENCIES_1) \
+	$(top_builddir)/replace/libreplace.la
+am_cl_status_OBJECTS = cl_status.$(OBJEXT)
+cl_status_OBJECTS = $(am_cl_status_OBJECTS)
+am_pingd_OBJECTS = pingd.$(OBJEXT)
+pingd_OBJECTS = $(am_pingd_OBJECTS)
+pingd_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
+	$(top_builddir)/lib/crm/common/libcrmcommon.la \
+	$(top_builddir)/lib/hbclient/libhbclient.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+halibSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(halib_SCRIPTS) $(sbin_SCRIPTS)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(attrd_SOURCES) $(attrd_updater_SOURCES) \
+	$(cl_respawn_SOURCES) $(cl_status_SOURCES) $(pingd_SOURCES)
+DIST_SOURCES = $(attrd_SOURCES) $(attrd_updater_SOURCES) \
+	$(cl_respawn_SOURCES) $(cl_status_SOURCES) $(pingd_SOURCES)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+hanoarchDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(hanoarch_DATA)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -90,8 +152,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -135,8 +195,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -148,6 +206,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -155,12 +214,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -178,8 +233,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -188,15 +241,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -226,8 +276,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -248,8 +296,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -260,20 +306,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -281,17 +315,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -299,6 +335,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -320,6 +357,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -334,12 +372,15 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 #
 # heartbeat: Linux-HA heartbeat code
@@ -361,28 +402,19 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in ccdv
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
 			  -I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
 			  -I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
 
-
 EXTRA_DIST = ccdv.c attrd.h $(hanoarch_DATA) $(sbin_SCRIPTS)
-
 apigid = @HA_APIGID@
 habindir = @bindir@
 halibdir = $(libdir)/@HB_PKG@
 hanoarchdir = @HA_NOARCHDATAHBDIR@
 gliblib = @GLIBLIB@
-
-habin_PROGRAMS = cl_status cl_respawn 
 halib_SCRIPTS = haresources2cib.py
 hanoarch_DATA = utillib.sh
 sbin_SCRIPTS = ciblint hb_report ocf-tester
-
-@CRM_BUILD_TRUE@halib_PROGRAMS = attrd pingd
-@CRM_BUILD_TRUE@sbin_PROGRAMS = attrd_updater
-
 cl_status_SOURCES = cl_status.c
 # A little trick. Now ccdv can be auto-built but not auto-cleaned.
 cl_status_DEPENDENCIES = ccdv
@@ -391,14 +423,12 @@
 			  $(gliblib)					\
 			  $(top_builddir)/replace/libreplace.la
 
-
 cl_respawn_SOURCES = cl_respawn.c
 cl_respawn_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la	\
 			  $(top_builddir)/lib/apphb/libapphb.la 	\
 			  $(gliblib)					\
 			  $(top_builddir)/replace/libreplace.la
 
-
 attrd_SOURCES = attrd.c
 attrd_LDADD = \
 		  $(top_builddir)/lib/clplumbing/libplumb.la		\
@@ -408,7 +438,6 @@
 		  $(GLIBLIB)						\
 		  $(LIBRT)
 
-
 pingd_SOURCES = pingd.c
 pingd_LDADD = \
 		  $(top_builddir)/lib/clplumbing/libplumb.la		\
@@ -417,7 +446,6 @@
 		  $(GLIBLIB)						\
 		  $(LIBRT)
 
-
 attrd_updater_SOURCES = attrd_updater.c
 attrd_updater_LDADD = \
 		  $(top_builddir)/lib/clplumbing/libplumb.la		\
@@ -425,100 +453,58 @@
 		  $(GLIBLIB)						\
 		  $(LIBRT)
 
-subdir = tools
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES = ciblint haresources2cib.py hb_report ocf-tester
-habin_PROGRAMS = cl_status$(EXEEXT) cl_respawn$(EXEEXT)
-@CRM_BUILD_TRUE@halib_PROGRAMS = attrd$(EXEEXT) pingd$(EXEEXT)
-@CRM_BUILD_FALSE@halib_PROGRAMS =
-@CRM_BUILD_TRUE@sbin_PROGRAMS = attrd_updater$(EXEEXT)
-@CRM_BUILD_FALSE@sbin_PROGRAMS =
-PROGRAMS = $(habin_PROGRAMS) $(halib_PROGRAMS) $(sbin_PROGRAMS)
-
-am_attrd_OBJECTS = attrd.$(OBJEXT)
-attrd_OBJECTS = $(am_attrd_OBJECTS)
-attrd_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/crm/common/libcrmcommon.la \
-	$(top_builddir)/lib/hbclient/libhbclient.la \
-	$(top_builddir)/lib/crm/cib/libcib.la
-attrd_LDFLAGS =
-am_attrd_updater_OBJECTS = attrd_updater.$(OBJEXT)
-attrd_updater_OBJECTS = $(am_attrd_updater_OBJECTS)
-attrd_updater_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/crm/common/libcrmcommon.la
-attrd_updater_LDFLAGS =
-am_cl_respawn_OBJECTS = cl_respawn.$(OBJEXT)
-cl_respawn_OBJECTS = $(am_cl_respawn_OBJECTS)
-cl_respawn_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/apphb/libapphb.la \
-	$(top_builddir)/replace/libreplace.la
-cl_respawn_LDFLAGS =
-am_cl_status_OBJECTS = cl_status.$(OBJEXT)
-cl_status_OBJECTS = $(am_cl_status_OBJECTS)
-cl_status_LDFLAGS =
-am_pingd_OBJECTS = pingd.$(OBJEXT)
-pingd_OBJECTS = $(am_pingd_OBJECTS)
-pingd_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/crm/common/libcrmcommon.la \
-	$(top_builddir)/lib/hbclient/libhbclient.la
-pingd_LDFLAGS =
-SCRIPTS = $(halib_SCRIPTS) $(sbin_SCRIPTS)
-
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/attrd.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/attrd_updater.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/cl_respawn.Po ./$(DEPDIR)/cl_status.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/pingd.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(attrd_SOURCES) $(attrd_updater_SOURCES) \
-	$(cl_respawn_SOURCES) $(cl_status_SOURCES) $(pingd_SOURCES)
-DATA = $(hanoarch_DATA)
-
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am ciblint.in \
-	haresources2cib.py.in hb_report.in ocf-tester.in
-SOURCES = $(attrd_SOURCES) $(attrd_updater_SOURCES) $(cl_respawn_SOURCES) $(cl_status_SOURCES) $(pingd_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tools/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  tools/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-ciblint: $(top_builddir)/config.status ciblint.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ciblint: $(top_builddir)/config.status $(srcdir)/ciblint.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-haresources2cib.py: $(top_builddir)/config.status haresources2cib.py.in
+haresources2cib.py: $(top_builddir)/config.status $(srcdir)/haresources2cib.py.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-hb_report: $(top_builddir)/config.status hb_report.in
+hb_report: $(top_builddir)/config.status $(srcdir)/hb_report.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-ocf-tester: $(top_builddir)/config.status ocf-tester.in
+ocf-tester: $(top_builddir)/config.status $(srcdir)/ocf-tester.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-habinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-habinPROGRAMS: $(habin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(habindir)
+	test -z "$(habindir)" || $(MKDIR_P) "$(DESTDIR)$(habindir)"
 	@list='$(habin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(habinPROGRAMS_INSTALL) $$p $(DESTDIR)$(habindir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(habinPROGRAMS_INSTALL) $$p $(DESTDIR)$(habindir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(habinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(habindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(habinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(habindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -526,8 +512,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(habin_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(habindir)/$$f"; \
-	  rm -f $(DESTDIR)$(habindir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(habindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(habindir)/$$f"; \
 	done
 
 clean-habinPROGRAMS:
@@ -536,18 +522,17 @@
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
 	done
-halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-halibPROGRAMS: $(halib_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	test -z "$(halibdir)" || $(MKDIR_P) "$(DESTDIR)$(halibdir)"
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) $$p $(DESTDIR)$(halibdir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -555,8 +540,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(halib_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(halibdir)/$$f"; \
-	  rm -f $(DESTDIR)$(halibdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(halibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(halibdir)/$$f"; \
 	done
 
 clean-halibPROGRAMS:
@@ -565,18 +550,17 @@
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
 	done
-sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(sbindir)
+	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -584,8 +568,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \
-	  rm -f $(DESTDIR)$(sbindir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(sbindir)/$$f"; \
 	done
 
 clean-sbinPROGRAMS:
@@ -596,29 +580,28 @@
 	done
 attrd$(EXEEXT): $(attrd_OBJECTS) $(attrd_DEPENDENCIES) 
 	@rm -f attrd$(EXEEXT)
-	$(LINK) $(attrd_LDFLAGS) $(attrd_OBJECTS) $(attrd_LDADD) $(LIBS)
+	$(LINK) $(attrd_OBJECTS) $(attrd_LDADD) $(LIBS)
 attrd_updater$(EXEEXT): $(attrd_updater_OBJECTS) $(attrd_updater_DEPENDENCIES) 
 	@rm -f attrd_updater$(EXEEXT)
-	$(LINK) $(attrd_updater_LDFLAGS) $(attrd_updater_OBJECTS) $(attrd_updater_LDADD) $(LIBS)
+	$(LINK) $(attrd_updater_OBJECTS) $(attrd_updater_LDADD) $(LIBS)
 cl_respawn$(EXEEXT): $(cl_respawn_OBJECTS) $(cl_respawn_DEPENDENCIES) 
 	@rm -f cl_respawn$(EXEEXT)
-	$(LINK) $(cl_respawn_LDFLAGS) $(cl_respawn_OBJECTS) $(cl_respawn_LDADD) $(LIBS)
+	$(LINK) $(cl_respawn_OBJECTS) $(cl_respawn_LDADD) $(LIBS)
 cl_status$(EXEEXT): $(cl_status_OBJECTS) $(cl_status_DEPENDENCIES) 
 	@rm -f cl_status$(EXEEXT)
-	$(LINK) $(cl_status_LDFLAGS) $(cl_status_OBJECTS) $(cl_status_LDADD) $(LIBS)
+	$(LINK) $(cl_status_OBJECTS) $(cl_status_LDADD) $(LIBS)
 pingd$(EXEEXT): $(pingd_OBJECTS) $(pingd_DEPENDENCIES) 
 	@rm -f pingd$(EXEEXT)
-	$(LINK) $(pingd_LDFLAGS) $(pingd_OBJECTS) $(pingd_LDADD) $(LIBS)
-halibSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+	$(LINK) $(pingd_OBJECTS) $(pingd_LDADD) $(LIBS)
 install-halibSCRIPTS: $(halib_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(halibdir)
+	test -z "$(halibdir)" || $(MKDIR_P) "$(DESTDIR)$(halibdir)"
 	@list='$(halib_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(halibSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(halibdir)/$$f"; \
-	    $(halibSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(halibdir)/$$f; \
+	    echo " $(halibSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	    $(halibSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(halibdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -626,19 +609,18 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(halib_SCRIPTS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f $(DESTDIR)$(halibdir)/$$f"; \
-	  rm -f $(DESTDIR)$(halibdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(halibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(halibdir)/$$f"; \
 	done
-sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 install-sbinSCRIPTS: $(sbin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(sbindir)
+	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
 	@list='$(sbin_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(sbinSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(sbindir)/$$f"; \
-	    $(sbinSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(sbindir)/$$f; \
+	    echo " $(sbinSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+	    $(sbinSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(sbindir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -646,12 +628,12 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(sbin_SCRIPTS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \
-	  rm -f $(DESTDIR)$(sbindir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(sbindir)/$$f"; \
 	done
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -663,74 +645,49 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pingd.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-hanoarchDATA_INSTALL = $(INSTALL_DATA)
 install-hanoarchDATA: $(hanoarch_DATA)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(hanoarchdir)
+	test -z "$(hanoarchdir)" || $(MKDIR_P) "$(DESTDIR)$(hanoarchdir)"
 	@list='$(hanoarch_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(hanoarchDATA_INSTALL) $$d$$p $(DESTDIR)$(hanoarchdir)/$$f"; \
-	  $(hanoarchDATA_INSTALL) $$d$$p $(DESTDIR)$(hanoarchdir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " $(hanoarchDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(hanoarchdir)/$$f'"; \
+	  $(hanoarchDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(hanoarchdir)/$$f"; \
 	done
 
 uninstall-hanoarchDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(hanoarch_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(hanoarchdir)/$$f"; \
-	  rm -f $(DESTDIR)$(hanoarchdir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(hanoarchdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(hanoarchdir)/$$f"; \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -739,6 +696,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -750,10 +708,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -776,28 +735,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -811,9 +765,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(habindir) $(DESTDIR)$(halibdir) $(DESTDIR)$(sbindir) $(DESTDIR)$(halibdir) $(DESTDIR)$(sbindir) $(DESTDIR)$(hanoarchdir)
+	for dir in "$(DESTDIR)$(habindir)" "$(DESTDIR)$(halibdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(halibdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(hanoarchdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -833,7 +788,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -848,12 +803,14 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -863,12 +820,20 @@
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-sbinPROGRAMS install-sbinSCRIPTS
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -890,25 +855,30 @@
 ps-am:
 
 uninstall-am: uninstall-habinPROGRAMS uninstall-halibPROGRAMS \
-	uninstall-halibSCRIPTS uninstall-hanoarchDATA uninstall-info-am \
+	uninstall-halibSCRIPTS uninstall-hanoarchDATA \
 	uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS
 
+.MAKE: install-am install-data-am install-strip
+
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-habinPROGRAMS clean-halibPROGRAMS clean-libtool \
 	clean-sbinPROGRAMS ctags distclean distclean-compile \
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-data-hook install-dvi \
+	install-dvi-am install-exec install-exec-am \
 	install-habinPROGRAMS install-halibPROGRAMS \
-	install-halibSCRIPTS install-hanoarchDATA install-info \
-	install-info-am install-man install-sbinPROGRAMS \
-	install-sbinSCRIPTS install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-habinPROGRAMS uninstall-halibPROGRAMS \
-	uninstall-halibSCRIPTS uninstall-hanoarchDATA uninstall-info-am \
-	uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS
+	install-halibSCRIPTS install-hanoarchDATA install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-sbinPROGRAMS install-sbinSCRIPTS install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-habinPROGRAMS \
+	uninstall-halibPROGRAMS uninstall-halibSCRIPTS \
+	uninstall-hanoarchDATA uninstall-sbinPROGRAMS \
+	uninstall-sbinSCRIPTS
 
 
 ccdv: 	$(top_srcdir)/tools/ccdv.c
--- a/tsa_plugin/Makefile.in
+++ b/tsa_plugin/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -34,16 +34,14 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
+
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -55,39 +53,97 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
+tsa_PROGRAMS = tsa_eventd$(EXEEXT)
+cli_PROGRAMS = tsa_hacli$(EXEEXT)
+noinst_PROGRAMS = dummy$(EXEEXT)
+subdir = tsa_plugin
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/linuxha-adapter.in $(srcdir)/testrun.sh.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES = testrun.sh linuxha-adapter
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(hamgmtlibdir)" "$(DESTDIR)$(clidir)" \
+	"$(DESTDIR)$(tsadir)" "$(DESTDIR)$(adapterdir)" \
+	"$(DESTDIR)$(jardir)"
+hamgmtlibLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(hamgmtlib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+am__DEPENDENCIES_2 = $(top_builddir)/lib/clplumbing/libplumb.la \
+	$(top_builddir)/lib/hbclient/libhbclient.la \
+	$(top_builddir)/membership/ccm/libccmclient.la \
+	$(top_builddir)/membership/ccm/libclm.la $(am__DEPENDENCIES_1)
+liblhamgmt_la_DEPENDENCIES = $(am__DEPENDENCIES_2) $(MGMTLIBS)
+am_liblhamgmt_la_OBJECTS = liblhamgmt_la-ha_mgmt_client_wrap.lo \
+	liblhamgmt_la-ha_mgmt_client.lo liblhamgmt_la-ha_tsa_common.lo
+liblhamgmt_la_OBJECTS = $(am_liblhamgmt_la_OBJECTS)
+liblhamgmt_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(liblhamgmt_la_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+cliPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+tsaPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(cli_PROGRAMS) $(noinst_PROGRAMS) $(tsa_PROGRAMS)
+am_dummy_OBJECTS = dummy.$(OBJEXT)
+dummy_OBJECTS = $(am_dummy_OBJECTS)
+dummy_DEPENDENCIES = liblhamgmt.la
+am_tsa_eventd_OBJECTS = tsa_eventd.$(OBJEXT) ha_tsa_common.$(OBJEXT)
+tsa_eventd_OBJECTS = $(am_tsa_eventd_OBJECTS)
+tsa_eventd_DEPENDENCIES = $(am__DEPENDENCIES_2) $(MGMTLIBS)
+am_tsa_hacli_OBJECTS = tsa_hacli.$(OBJEXT) ha_tsa_common.$(OBJEXT)
+tsa_hacli_OBJECTS = $(am_tsa_hacli_OBJECTS)
+tsa_hacli_DEPENDENCIES = $(am__DEPENDENCIES_2) $(MGMTLIBS)
+adapterSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(adapter_SCRIPTS)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(liblhamgmt_la_SOURCES) $(dummy_SOURCES) \
+	$(tsa_eventd_SOURCES) $(tsa_hacli_SOURCES)
+DIST_SOURCES = $(liblhamgmt_la_SOURCES) $(dummy_SOURCES) \
+	$(tsa_eventd_SOURCES) $(tsa_hacli_SOURCES)
+jarDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(jar_DATA)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_BZ2_COMPRESS_MODULE_FALSE = @BUILD_BZ2_COMPRESS_MODULE_FALSE@
-BUILD_BZ2_COMPRESS_MODULE_TRUE = @BUILD_BZ2_COMPRESS_MODULE_TRUE@
-BUILD_DRBD_OUTDATE_PEER_FALSE = @BUILD_DRBD_OUTDATE_PEER_FALSE@
-BUILD_DRBD_OUTDATE_PEER_TRUE = @BUILD_DRBD_OUTDATE_PEER_TRUE@
-BUILD_OPENAIS_MODULE_FALSE = @BUILD_OPENAIS_MODULE_FALSE@
-BUILD_OPENAIS_MODULE_TRUE = @BUILD_OPENAIS_MODULE_TRUE@
-BUILD_TIPC_MODULE_FALSE = @BUILD_TIPC_MODULE_FALSE@
-BUILD_TIPC_MODULE_TRUE = @BUILD_TIPC_MODULE_TRUE@
-BUILD_ZLIB_COMPRESS_MODULE_FALSE = @BUILD_ZLIB_COMPRESS_MODULE_FALSE@
-BUILD_ZLIB_COMPRESS_MODULE_TRUE = @BUILD_ZLIB_COMPRESS_MODULE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CIMOM = @CIMOM@
-CIM_PROVIDER_BUILD_FALSE = @CIM_PROVIDER_BUILD_FALSE@
-CIM_PROVIDER_BUILD_TRUE = @CIM_PROVIDER_BUILD_TRUE@
 CMPI_HEADER_PATH = @CMPI_HEADER_PATH@
 CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CRM_BUILD_FALSE = @CRM_BUILD_FALSE@
-CRM_BUILD_TRUE = @CRM_BUILD_TRUE@
 CRM_DIR = @CRM_DIR@
 CRM_ENABLED = @CRM_ENABLED@
 CRYPTOLIB = @CRYPTOLIB@
@@ -110,8 +166,6 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_THREAD_SAFE_FALSE = @ENABLE_THREAD_SAFE_FALSE@
-ENABLE_THREAD_SAFE_TRUE = @ENABLE_THREAD_SAFE_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
@@ -155,8 +209,6 @@
 HA_VARRUNDIR = @HA_VARRUNDIR@
 HA_VARRUNHBDIR = @HA_VARRUNHBDIR@
 HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@
-HBAAPI_BUILD_FALSE = @HBAAPI_BUILD_FALSE@
-HBAAPI_BUILD_TRUE = @HBAAPI_BUILD_TRUE@
 HB_INITSTARTPRI = @HB_INITSTARTPRI@
 HB_INITSTOPPRI = @HB_INITSTOPPRI@
 HB_PKG = @HB_PKG@
@@ -168,6 +220,7 @@
 INCLTDL = @INCLTDL@
 INITDIR = @INITDIR@
 INIT_EXT = @INIT_EXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -175,12 +228,8 @@
 IP2UTIL = @IP2UTIL@
 IPCSOCKET_C = @IPCSOCKET_C@
 IPCSOCKET_LO = @IPCSOCKET_LO@
-IPMILAN_BUILD_FALSE = @IPMILAN_BUILD_FALSE@
-IPMILAN_BUILD_TRUE = @IPMILAN_BUILD_TRUE@
 JAVA_HOME = @JAVA_HOME@
 LDFLAGS = @LDFLAGS@
-LDIRECTORD_BUILD_FALSE = @LDIRECTORD_BUILD_FALSE@
-LDIRECTORD_BUILD_TRUE = @LDIRECTORD_BUILD_TRUE@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -198,8 +247,6 @@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALE = @LOCALE@
-LRM_BUILD_FALSE = @LRM_BUILD_FALSE@
-LRM_BUILD_TRUE = @LRM_BUILD_TRUE@
 LRM_ENABLED = @LRM_ENABLED@
 LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@
 LSB_RA_DIR = @LSB_RA_DIR@
@@ -208,15 +255,12 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
-MGMT_BUILD_FALSE = @MGMT_BUILD_FALSE@
-MGMT_BUILD_TRUE = @MGMT_BUILD_TRUE@
 MIBS_DIR = @MIBS_DIR@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
-NONROOT_CHOWN_FALSE = @NONROOT_CHOWN_FALSE@
-NONROOT_CHOWN_TRUE = @NONROOT_CHOWN_TRUE@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -246,8 +290,6 @@
 PYTHON_VERSION = @PYTHON_VERSION@
 QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
 QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@
-QUORUMD_BUILD_FALSE = @QUORUMD_BUILD_FALSE@
-QUORUMD_BUILD_TRUE = @QUORUMD_BUILD_TRUE@
 QUORUMD_ENABLED = @QUORUMD_ENABLED@
 RANLIB = @RANLIB@
 REBOOT = @REBOOT@
@@ -268,8 +310,6 @@
 SNMPCONFIG = @SNMPCONFIG@
 SNMPLIB = @SNMPLIB@
 SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@
-SNMP_SUBAGENT_BUILD_FALSE = @SNMP_SUBAGENT_BUILD_FALSE@
-SNMP_SUBAGENT_BUILD_TRUE = @SNMP_SUBAGENT_BUILD_TRUE@
 SSH = @SSH@
 STONITHPKG = @STONITHPKG@
 STONITH_RA_DIR = @STONITH_RA_DIR@
@@ -280,20 +320,8 @@
 TEST = @TEST@
 TIPC_INCLUDE = @TIPC_INCLUDE@
 TSA_DIR = @TSA_DIR@
-TSA_PLUGIN_BUILD_FALSE = @TSA_PLUGIN_BUILD_FALSE@
-TSA_PLUGIN_BUILD_TRUE = @TSA_PLUGIN_BUILD_TRUE@
 UCDSNMPDEVEL = @UCDSNMPDEVEL@
-USE_APC_SNMP_FALSE = @USE_APC_SNMP_FALSE@
-USE_APC_SNMP_TRUE = @USE_APC_SNMP_TRUE@
-USE_DRAC3_FALSE = @USE_DRAC3_FALSE@
-USE_DRAC3_TRUE = @USE_DRAC3_TRUE@
-USE_IPV6ADDR_FALSE = @USE_IPV6ADDR_FALSE@
-USE_IPV6ADDR_TRUE = @USE_IPV6ADDR_TRUE@
 USE_MODULES = @USE_MODULES@
-USE_OPENHPI_FALSE = @USE_OPENHPI_FALSE@
-USE_OPENHPI_TRUE = @USE_OPENHPI_TRUE@
-USE_VACM_FALSE = @USE_VACM_FALSE@
-USE_VACM_TRUE = @USE_VACM_TRUE@
 VALGRIND_BIN = @VALGRIND_BIN@
 VERSION = @VERSION@
 WHOAMI = @WHOAMI@
@@ -301,17 +329,19 @@
 XPERIMENTALDIRS = @XPERIMENTALDIRS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_configure_args = @ac_configure_args@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 base_includedir = @base_includedir@
 bindir = @bindir@
 build = @build@
@@ -319,6 +349,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 cleaned_configure_args = @cleaned_configure_args@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -340,6 +371,7 @@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pils_includedir = @pils_includedir@
@@ -354,46 +386,41 @@
 saf_includedir = @saf_includedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 stonith_ext_plugindir = @stonith_ext_plugindir@
 stonith_includedir = @stonith_includedir@
 stonith_plugindir = @stonith_plugindir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 TSA_LIBDIR = $(TSA_DIR)/sam/lib
 CLASSPATH = .:${JAVA_HOME}/lib/dt.jar:${JAVA_HOME}/lib/tools.jar:${TSA_LIBDIR}/eezadapter.jar:${TSA_LIBDIR}/jlanclient.jar:${TSA_LIBDIR}/eezcfghelp.jar:${TSA_LIBDIR}/jlog.jar:${TSA_LIBDIR}/eezmsgs.jar:${TSA_LIBDIR}/log.jar:${TSA_LIBDIR}/eezmsgs_lang.jar:${TSA_LIBDIR}/remoteaccess.jar:${TSA_LIBDIR}/eezpolldr.jar:${TSA_LIBDIR}/samfla.jar:${TSA_LIBDIR}/eezsdk.jar:${TSA_LIBDIR}/sammsgs.jar:${TSA_LIBDIR}/eezutils.jar:${TSA_LIBDIR}/sampolicy.jar:${TSA_LIBDIR}/evd.jar:${TSA_LIBDIR}/samrmc.jar:${TSA_LIBDIR}/jffdc.jar:${TSA_LIBDIR}/ssh.jar:${TSA_LIBDIR}/jhall.jar:${TSA_LIBDIR}/tivolicommondir.jar
-
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include    \
                           -I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha  \
                           -I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl    \
                           -I$(CMPI_HEADER_PATH)
 
-
 COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la      \
                           $(top_builddir)/lib/hbclient/libhbclient.la     \
 			  $(top_builddir)/membership/ccm/libccmclient.la  \
 			  $(top_builddir)/membership/ccm/libclm.la        \
 			  $(GLIBLIB)
 
-
 LRM_DIR = lrm
 MGMTLIBS = $(top_builddir)/mgmt/daemon/libhbmgmt.la     \
                            $(top_builddir)/lib/mgmt/libhbmgmtcommon.la  \
                            $(top_builddir)/lib/$(LRM_DIR)/liblrm.la
 
-
 hamgmtlibdir = /usr/lib
 hamgmtlib_LTLIBRARIES = liblhamgmt.la
-
 jardir = $(TSA_LIBDIR)
 jar_DATA = linuxhafla.jar
-
 swig_gen_files = ${JAVA_PACKAGE_DIR}/LHAMgmtLibJNI.java 	\
 			  ${JAVA_PACKAGE_DIR}/LHAMgmtLib.java 		\
 			  ha_mgmt_client_wrap.c
 
-
 JAVA_PACKAGE_DIR = $(top_srcdir)/tsa_plugin/org/linuxha/sam/plugin
 java_sources = ${JAVA_PACKAGE_DIR}/LHAMgmtLibJNI.java	\
 			  ${JAVA_PACKAGE_DIR}/LHANativeResource.java	\
@@ -413,163 +440,100 @@
 			  ${JAVA_PACKAGE_DIR}/LHAMgmtLib.java		\
 			  ${JAVA_PACKAGE_DIR}/Utilities.java
 
-
 EXTRA_DIST = ha_mgmt_client.i
-
 liblhamgmt_la_SOURCES = ha_mgmt_client_wrap.c ha_mgmt_client.c ha_mgmt_client.h	\
 			  ha_tsa_common.h ha_tsa_common.c
 
 liblhamgmt_la_CFLAGS = $(INCLUDES) -I$(top_builddir)/include -w
 liblhamgmt_la_LIBADD = $(COMMONLIBS) $(MGMTLIBS)
-
 tsadir = $(libdir)/@HB_PKG@
-tsa_PROGRAMS = tsa_eventd
 tsa_eventd_SOURCES = tsa_eventd.c ha_tsa_common.c
 tsa_eventd_LDADD = $(COMMONLIBS) $(MGMTLIBS)
-
 CLEANFILES = org/linuxha/sam/plugin/*.class *.jar ${swig_gen_files} 
-
 clidir = $(libdir)/@HB_PKG@
-cli_PROGRAMS = tsa_hacli 
 tsa_hacli_SOURCES = tsa_hacli.c ha_tsa_common.c
 tsa_hacli_LDADD = $(COMMONLIBS) $(MGMTLIBS)
-
 adapterdir = $(libdir)/@HB_PKG@
 adapter_SCRIPTS = linuxha-adapter
-
-noinst_PROGRAMS = dummy
 dummy_SOURCES = dummy.c
 dummy_LDADD = liblhamgmt.la
-subdir = tsa_plugin
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h \
-	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES = testrun.sh linuxha-adapter
-LTLIBRARIES = $(hamgmtlib_LTLIBRARIES)
-
-liblhamgmt_la_LDFLAGS =
-liblhamgmt_la_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/hbclient/libhbclient.la \
-	$(top_builddir)/membership/ccm/libccmclient.la \
-	$(top_builddir)/membership/ccm/libclm.la \
-	$(top_builddir)/mgmt/daemon/libhbmgmt.la \
-	$(top_builddir)/lib/mgmt/libhbmgmtcommon.la \
-	$(top_builddir)/lib/$(LRM_DIR)/liblrm.la
-am_liblhamgmt_la_OBJECTS = liblhamgmt_la-ha_mgmt_client_wrap.lo \
-	liblhamgmt_la-ha_mgmt_client.lo liblhamgmt_la-ha_tsa_common.lo
-liblhamgmt_la_OBJECTS = $(am_liblhamgmt_la_OBJECTS)
-cli_PROGRAMS = tsa_hacli$(EXEEXT)
-noinst_PROGRAMS = dummy$(EXEEXT)
-tsa_PROGRAMS = tsa_eventd$(EXEEXT)
-PROGRAMS = $(cli_PROGRAMS) $(noinst_PROGRAMS) $(tsa_PROGRAMS)
-
-am_dummy_OBJECTS = dummy.$(OBJEXT)
-dummy_OBJECTS = $(am_dummy_OBJECTS)
-dummy_DEPENDENCIES = liblhamgmt.la
-dummy_LDFLAGS =
-am_tsa_eventd_OBJECTS = tsa_eventd.$(OBJEXT) ha_tsa_common.$(OBJEXT)
-tsa_eventd_OBJECTS = $(am_tsa_eventd_OBJECTS)
-tsa_eventd_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/hbclient/libhbclient.la \
-	$(top_builddir)/membership/ccm/libccmclient.la \
-	$(top_builddir)/membership/ccm/libclm.la \
-	$(top_builddir)/mgmt/daemon/libhbmgmt.la \
-	$(top_builddir)/lib/mgmt/libhbmgmtcommon.la \
-	$(top_builddir)/lib/$(LRM_DIR)/liblrm.la
-tsa_eventd_LDFLAGS =
-am_tsa_hacli_OBJECTS = tsa_hacli.$(OBJEXT) ha_tsa_common.$(OBJEXT)
-tsa_hacli_OBJECTS = $(am_tsa_hacli_OBJECTS)
-tsa_hacli_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
-	$(top_builddir)/lib/hbclient/libhbclient.la \
-	$(top_builddir)/membership/ccm/libccmclient.la \
-	$(top_builddir)/membership/ccm/libclm.la \
-	$(top_builddir)/mgmt/daemon/libhbmgmt.la \
-	$(top_builddir)/lib/mgmt/libhbmgmtcommon.la \
-	$(top_builddir)/lib/$(LRM_DIR)/liblrm.la
-tsa_hacli_LDFLAGS =
-SCRIPTS = $(adapter_SCRIPTS)
-
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/ha_tsa_common.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/liblhamgmt_la-ha_mgmt_client.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/liblhamgmt_la-ha_mgmt_client_wrap.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/liblhamgmt_la-ha_tsa_common.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/tsa_eventd.Po ./$(DEPDIR)/tsa_hacli.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(liblhamgmt_la_SOURCES) $(dummy_SOURCES) \
-	$(tsa_eventd_SOURCES) $(tsa_hacli_SOURCES)
-DATA = $(jar_DATA)
-
-DIST_COMMON = README $(srcdir)/Makefile.in Makefile.am \
-	linuxha-adapter.in testrun.sh.in
-SOURCES = $(liblhamgmt_la_SOURCES) $(dummy_SOURCES) $(tsa_eventd_SOURCES) $(tsa_hacli_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tsa_plugin/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  tsa_plugin/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-testrun.sh: $(top_builddir)/config.status testrun.sh.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+testrun.sh: $(top_builddir)/config.status $(srcdir)/testrun.sh.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-linuxha-adapter: $(top_builddir)/config.status linuxha-adapter.in
+linuxha-adapter: $(top_builddir)/config.status $(srcdir)/linuxha-adapter.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-hamgmtlibLTLIBRARIES_INSTALL = $(INSTALL)
 install-hamgmtlibLTLIBRARIES: $(hamgmtlib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(hamgmtlibdir)
+	test -z "$(hamgmtlibdir)" || $(MKDIR_P) "$(DESTDIR)$(hamgmtlibdir)"
 	@list='$(hamgmtlib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(hamgmtlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(hamgmtlibdir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(hamgmtlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(hamgmtlibdir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(hamgmtlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(hamgmtlibdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(hamgmtlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(hamgmtlibdir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-hamgmtlibLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(hamgmtlib_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(hamgmtlibdir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(hamgmtlibdir)/$$p; \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(hamgmtlibdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(hamgmtlibdir)/$$p"; \
 	done
 
 clean-hamgmtlibLTLIBRARIES:
 	-test -z "$(hamgmtlib_LTLIBRARIES)" || rm -f $(hamgmtlib_LTLIBRARIES)
 	@list='$(hamgmtlib_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 liblhamgmt.la: $(liblhamgmt_la_OBJECTS) $(liblhamgmt_la_DEPENDENCIES) 
-	$(LINK) -rpath $(hamgmtlibdir) $(liblhamgmt_la_LDFLAGS) $(liblhamgmt_la_OBJECTS) $(liblhamgmt_la_LIBADD) $(LIBS)
-cliPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+	$(liblhamgmt_la_LINK) -rpath $(hamgmtlibdir) $(liblhamgmt_la_OBJECTS) $(liblhamgmt_la_LIBADD) $(LIBS)
 install-cliPROGRAMS: $(cli_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(clidir)
+	test -z "$(clidir)" || $(MKDIR_P) "$(DESTDIR)$(clidir)"
 	@list='$(cli_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(cliPROGRAMS_INSTALL) $$p $(DESTDIR)$(clidir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(cliPROGRAMS_INSTALL) $$p $(DESTDIR)$(clidir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(cliPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(clidir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(cliPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(clidir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -577,8 +541,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(cli_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(clidir)/$$f"; \
-	  rm -f $(DESTDIR)$(clidir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(clidir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(clidir)/$$f"; \
 	done
 
 clean-cliPROGRAMS:
@@ -594,18 +558,17 @@
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
 	done
-tsaPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-tsaPROGRAMS: $(tsa_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(tsadir)
+	test -z "$(tsadir)" || $(MKDIR_P) "$(DESTDIR)$(tsadir)"
 	@list='$(tsa_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(tsaPROGRAMS_INSTALL) $$p $(DESTDIR)$(tsadir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(tsaPROGRAMS_INSTALL) $$p $(DESTDIR)$(tsadir)/$$f || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(tsaPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(tsadir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(tsaPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(tsadir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -613,8 +576,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(tsa_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(tsadir)/$$f"; \
-	  rm -f $(DESTDIR)$(tsadir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(tsadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(tsadir)/$$f"; \
 	done
 
 clean-tsaPROGRAMS:
@@ -625,23 +588,22 @@
 	done
 dummy$(EXEEXT): $(dummy_OBJECTS) $(dummy_DEPENDENCIES) 
 	@rm -f dummy$(EXEEXT)
-	$(LINK) $(dummy_LDFLAGS) $(dummy_OBJECTS) $(dummy_LDADD) $(LIBS)
+	$(LINK) $(dummy_OBJECTS) $(dummy_LDADD) $(LIBS)
 tsa_eventd$(EXEEXT): $(tsa_eventd_OBJECTS) $(tsa_eventd_DEPENDENCIES) 
 	@rm -f tsa_eventd$(EXEEXT)
-	$(LINK) $(tsa_eventd_LDFLAGS) $(tsa_eventd_OBJECTS) $(tsa_eventd_LDADD) $(LIBS)
+	$(LINK) $(tsa_eventd_OBJECTS) $(tsa_eventd_LDADD) $(LIBS)
 tsa_hacli$(EXEEXT): $(tsa_hacli_OBJECTS) $(tsa_hacli_DEPENDENCIES) 
 	@rm -f tsa_hacli$(EXEEXT)
-	$(LINK) $(tsa_hacli_LDFLAGS) $(tsa_hacli_OBJECTS) $(tsa_hacli_LDADD) $(LIBS)
-adapterSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+	$(LINK) $(tsa_hacli_OBJECTS) $(tsa_hacli_LDADD) $(LIBS)
 install-adapterSCRIPTS: $(adapter_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(adapterdir)
+	test -z "$(adapterdir)" || $(MKDIR_P) "$(DESTDIR)$(adapterdir)"
 	@list='$(adapter_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(adapterSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(adapterdir)/$$f"; \
-	    $(adapterSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(adapterdir)/$$f; \
+	    echo " $(adapterSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(adapterdir)/$$f'"; \
+	    $(adapterSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(adapterdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -649,12 +611,12 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(adapter_SCRIPTS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f $(DESTDIR)$(adapterdir)/$$f"; \
-	  rm -f $(DESTDIR)$(adapterdir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(adapterdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(adapterdir)/$$f"; \
 	done
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -668,173 +630,70 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tsa_hacli.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-liblhamgmt_la-ha_mgmt_client_wrap.o: ha_mgmt_client_wrap.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblhamgmt_la_CFLAGS) $(CFLAGS) -MT liblhamgmt_la-ha_mgmt_client_wrap.o -MD -MP -MF "$(DEPDIR)/liblhamgmt_la-ha_mgmt_client_wrap.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o liblhamgmt_la-ha_mgmt_client_wrap.o `test -f 'ha_mgmt_client_wrap.c' || echo '$(srcdir)/'`ha_mgmt_client_wrap.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/liblhamgmt_la-ha_mgmt_client_wrap.Tpo" "$(DEPDIR)/liblhamgmt_la-ha_mgmt_client_wrap.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/liblhamgmt_la-ha_mgmt_client_wrap.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ha_mgmt_client_wrap.c' object='liblhamgmt_la-ha_mgmt_client_wrap.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/liblhamgmt_la-ha_mgmt_client_wrap.Po' tmpdepfile='$(DEPDIR)/liblhamgmt_la-ha_mgmt_client_wrap.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblhamgmt_la_CFLAGS) $(CFLAGS) -c -o liblhamgmt_la-ha_mgmt_client_wrap.o `test -f 'ha_mgmt_client_wrap.c' || echo '$(srcdir)/'`ha_mgmt_client_wrap.c
-
-liblhamgmt_la-ha_mgmt_client_wrap.obj: ha_mgmt_client_wrap.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblhamgmt_la_CFLAGS) $(CFLAGS) -MT liblhamgmt_la-ha_mgmt_client_wrap.obj -MD -MP -MF "$(DEPDIR)/liblhamgmt_la-ha_mgmt_client_wrap.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o liblhamgmt_la-ha_mgmt_client_wrap.obj `if test -f 'ha_mgmt_client_wrap.c'; then $(CYGPATH_W) 'ha_mgmt_client_wrap.c'; else $(CYGPATH_W) '$(srcdir)/ha_mgmt_client_wrap.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/liblhamgmt_la-ha_mgmt_client_wrap.Tpo" "$(DEPDIR)/liblhamgmt_la-ha_mgmt_client_wrap.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/liblhamgmt_la-ha_mgmt_client_wrap.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ha_mgmt_client_wrap.c' object='liblhamgmt_la-ha_mgmt_client_wrap.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/liblhamgmt_la-ha_mgmt_client_wrap.Po' tmpdepfile='$(DEPDIR)/liblhamgmt_la-ha_mgmt_client_wrap.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblhamgmt_la_CFLAGS) $(CFLAGS) -c -o liblhamgmt_la-ha_mgmt_client_wrap.obj `if test -f 'ha_mgmt_client_wrap.c'; then $(CYGPATH_W) 'ha_mgmt_client_wrap.c'; else $(CYGPATH_W) '$(srcdir)/ha_mgmt_client_wrap.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 liblhamgmt_la-ha_mgmt_client_wrap.lo: ha_mgmt_client_wrap.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblhamgmt_la_CFLAGS) $(CFLAGS) -MT liblhamgmt_la-ha_mgmt_client_wrap.lo -MD -MP -MF "$(DEPDIR)/liblhamgmt_la-ha_mgmt_client_wrap.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o liblhamgmt_la-ha_mgmt_client_wrap.lo `test -f 'ha_mgmt_client_wrap.c' || echo '$(srcdir)/'`ha_mgmt_client_wrap.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/liblhamgmt_la-ha_mgmt_client_wrap.Tpo" "$(DEPDIR)/liblhamgmt_la-ha_mgmt_client_wrap.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/liblhamgmt_la-ha_mgmt_client_wrap.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblhamgmt_la_CFLAGS) $(CFLAGS) -MT liblhamgmt_la-ha_mgmt_client_wrap.lo -MD -MP -MF $(DEPDIR)/liblhamgmt_la-ha_mgmt_client_wrap.Tpo -c -o liblhamgmt_la-ha_mgmt_client_wrap.lo `test -f 'ha_mgmt_client_wrap.c' || echo '$(srcdir)/'`ha_mgmt_client_wrap.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/liblhamgmt_la-ha_mgmt_client_wrap.Tpo $(DEPDIR)/liblhamgmt_la-ha_mgmt_client_wrap.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ha_mgmt_client_wrap.c' object='liblhamgmt_la-ha_mgmt_client_wrap.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/liblhamgmt_la-ha_mgmt_client_wrap.Plo' tmpdepfile='$(DEPDIR)/liblhamgmt_la-ha_mgmt_client_wrap.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblhamgmt_la_CFLAGS) $(CFLAGS) -c -o liblhamgmt_la-ha_mgmt_client_wrap.lo `test -f 'ha_mgmt_client_wrap.c' || echo '$(srcdir)/'`ha_mgmt_client_wrap.c
-
-liblhamgmt_la-ha_mgmt_client.o: ha_mgmt_client.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblhamgmt_la_CFLAGS) $(CFLAGS) -MT liblhamgmt_la-ha_mgmt_client.o -MD -MP -MF "$(DEPDIR)/liblhamgmt_la-ha_mgmt_client.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o liblhamgmt_la-ha_mgmt_client.o `test -f 'ha_mgmt_client.c' || echo '$(srcdir)/'`ha_mgmt_client.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/liblhamgmt_la-ha_mgmt_client.Tpo" "$(DEPDIR)/liblhamgmt_la-ha_mgmt_client.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/liblhamgmt_la-ha_mgmt_client.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ha_mgmt_client.c' object='liblhamgmt_la-ha_mgmt_client.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/liblhamgmt_la-ha_mgmt_client.Po' tmpdepfile='$(DEPDIR)/liblhamgmt_la-ha_mgmt_client.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblhamgmt_la_CFLAGS) $(CFLAGS) -c -o liblhamgmt_la-ha_mgmt_client.o `test -f 'ha_mgmt_client.c' || echo '$(srcdir)/'`ha_mgmt_client.c
-
-liblhamgmt_la-ha_mgmt_client.obj: ha_mgmt_client.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblhamgmt_la_CFLAGS) $(CFLAGS) -MT liblhamgmt_la-ha_mgmt_client.obj -MD -MP -MF "$(DEPDIR)/liblhamgmt_la-ha_mgmt_client.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o liblhamgmt_la-ha_mgmt_client.obj `if test -f 'ha_mgmt_client.c'; then $(CYGPATH_W) 'ha_mgmt_client.c'; else $(CYGPATH_W) '$(srcdir)/ha_mgmt_client.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/liblhamgmt_la-ha_mgmt_client.Tpo" "$(DEPDIR)/liblhamgmt_la-ha_mgmt_client.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/liblhamgmt_la-ha_mgmt_client.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ha_mgmt_client.c' object='liblhamgmt_la-ha_mgmt_client.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/liblhamgmt_la-ha_mgmt_client.Po' tmpdepfile='$(DEPDIR)/liblhamgmt_la-ha_mgmt_client.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblhamgmt_la_CFLAGS) $(CFLAGS) -c -o liblhamgmt_la-ha_mgmt_client.obj `if test -f 'ha_mgmt_client.c'; then $(CYGPATH_W) 'ha_mgmt_client.c'; else $(CYGPATH_W) '$(srcdir)/ha_mgmt_client.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblhamgmt_la_CFLAGS) $(CFLAGS) -c -o liblhamgmt_la-ha_mgmt_client_wrap.lo `test -f 'ha_mgmt_client_wrap.c' || echo '$(srcdir)/'`ha_mgmt_client_wrap.c
 
 liblhamgmt_la-ha_mgmt_client.lo: ha_mgmt_client.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblhamgmt_la_CFLAGS) $(CFLAGS) -MT liblhamgmt_la-ha_mgmt_client.lo -MD -MP -MF "$(DEPDIR)/liblhamgmt_la-ha_mgmt_client.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o liblhamgmt_la-ha_mgmt_client.lo `test -f 'ha_mgmt_client.c' || echo '$(srcdir)/'`ha_mgmt_client.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/liblhamgmt_la-ha_mgmt_client.Tpo" "$(DEPDIR)/liblhamgmt_la-ha_mgmt_client.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/liblhamgmt_la-ha_mgmt_client.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblhamgmt_la_CFLAGS) $(CFLAGS) -MT liblhamgmt_la-ha_mgmt_client.lo -MD -MP -MF $(DEPDIR)/liblhamgmt_la-ha_mgmt_client.Tpo -c -o liblhamgmt_la-ha_mgmt_client.lo `test -f 'ha_mgmt_client.c' || echo '$(srcdir)/'`ha_mgmt_client.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/liblhamgmt_la-ha_mgmt_client.Tpo $(DEPDIR)/liblhamgmt_la-ha_mgmt_client.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ha_mgmt_client.c' object='liblhamgmt_la-ha_mgmt_client.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/liblhamgmt_la-ha_mgmt_client.Plo' tmpdepfile='$(DEPDIR)/liblhamgmt_la-ha_mgmt_client.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblhamgmt_la_CFLAGS) $(CFLAGS) -c -o liblhamgmt_la-ha_mgmt_client.lo `test -f 'ha_mgmt_client.c' || echo '$(srcdir)/'`ha_mgmt_client.c
-
-liblhamgmt_la-ha_tsa_common.o: ha_tsa_common.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblhamgmt_la_CFLAGS) $(CFLAGS) -MT liblhamgmt_la-ha_tsa_common.o -MD -MP -MF "$(DEPDIR)/liblhamgmt_la-ha_tsa_common.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o liblhamgmt_la-ha_tsa_common.o `test -f 'ha_tsa_common.c' || echo '$(srcdir)/'`ha_tsa_common.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/liblhamgmt_la-ha_tsa_common.Tpo" "$(DEPDIR)/liblhamgmt_la-ha_tsa_common.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/liblhamgmt_la-ha_tsa_common.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ha_tsa_common.c' object='liblhamgmt_la-ha_tsa_common.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/liblhamgmt_la-ha_tsa_common.Po' tmpdepfile='$(DEPDIR)/liblhamgmt_la-ha_tsa_common.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblhamgmt_la_CFLAGS) $(CFLAGS) -c -o liblhamgmt_la-ha_tsa_common.o `test -f 'ha_tsa_common.c' || echo '$(srcdir)/'`ha_tsa_common.c
-
-liblhamgmt_la-ha_tsa_common.obj: ha_tsa_common.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblhamgmt_la_CFLAGS) $(CFLAGS) -MT liblhamgmt_la-ha_tsa_common.obj -MD -MP -MF "$(DEPDIR)/liblhamgmt_la-ha_tsa_common.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o liblhamgmt_la-ha_tsa_common.obj `if test -f 'ha_tsa_common.c'; then $(CYGPATH_W) 'ha_tsa_common.c'; else $(CYGPATH_W) '$(srcdir)/ha_tsa_common.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/liblhamgmt_la-ha_tsa_common.Tpo" "$(DEPDIR)/liblhamgmt_la-ha_tsa_common.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/liblhamgmt_la-ha_tsa_common.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ha_tsa_common.c' object='liblhamgmt_la-ha_tsa_common.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/liblhamgmt_la-ha_tsa_common.Po' tmpdepfile='$(DEPDIR)/liblhamgmt_la-ha_tsa_common.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblhamgmt_la_CFLAGS) $(CFLAGS) -c -o liblhamgmt_la-ha_tsa_common.obj `if test -f 'ha_tsa_common.c'; then $(CYGPATH_W) 'ha_tsa_common.c'; else $(CYGPATH_W) '$(srcdir)/ha_tsa_common.c'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblhamgmt_la_CFLAGS) $(CFLAGS) -c -o liblhamgmt_la-ha_mgmt_client.lo `test -f 'ha_mgmt_client.c' || echo '$(srcdir)/'`ha_mgmt_client.c
 
 liblhamgmt_la-ha_tsa_common.lo: ha_tsa_common.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblhamgmt_la_CFLAGS) $(CFLAGS) -MT liblhamgmt_la-ha_tsa_common.lo -MD -MP -MF "$(DEPDIR)/liblhamgmt_la-ha_tsa_common.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o liblhamgmt_la-ha_tsa_common.lo `test -f 'ha_tsa_common.c' || echo '$(srcdir)/'`ha_tsa_common.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/liblhamgmt_la-ha_tsa_common.Tpo" "$(DEPDIR)/liblhamgmt_la-ha_tsa_common.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/liblhamgmt_la-ha_tsa_common.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblhamgmt_la_CFLAGS) $(CFLAGS) -MT liblhamgmt_la-ha_tsa_common.lo -MD -MP -MF $(DEPDIR)/liblhamgmt_la-ha_tsa_common.Tpo -c -o liblhamgmt_la-ha_tsa_common.lo `test -f 'ha_tsa_common.c' || echo '$(srcdir)/'`ha_tsa_common.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/liblhamgmt_la-ha_tsa_common.Tpo $(DEPDIR)/liblhamgmt_la-ha_tsa_common.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ha_tsa_common.c' object='liblhamgmt_la-ha_tsa_common.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/liblhamgmt_la-ha_tsa_common.Plo' tmpdepfile='$(DEPDIR)/liblhamgmt_la-ha_tsa_common.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblhamgmt_la_CFLAGS) $(CFLAGS) -c -o liblhamgmt_la-ha_tsa_common.lo `test -f 'ha_tsa_common.c' || echo '$(srcdir)/'`ha_tsa_common.c
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblhamgmt_la_CFLAGS) $(CFLAGS) -c -o liblhamgmt_la-ha_tsa_common.lo `test -f 'ha_tsa_common.c' || echo '$(srcdir)/'`ha_tsa_common.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-jarDATA_INSTALL = $(INSTALL_DATA)
 install-jarDATA: $(jar_DATA)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(jardir)
+	test -z "$(jardir)" || $(MKDIR_P) "$(DESTDIR)$(jardir)"
 	@list='$(jar_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(jarDATA_INSTALL) $$d$$p $(DESTDIR)$(jardir)/$$f"; \
-	  $(jarDATA_INSTALL) $$d$$p $(DESTDIR)$(jardir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " $(jarDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(jardir)/$$f'"; \
+	  $(jarDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(jardir)/$$f"; \
 	done
 
 uninstall-jarDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(jar_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(jardir)/$$f"; \
-	  rm -f $(DESTDIR)$(jardir)/$$f; \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(jardir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(jardir)/$$f"; \
 	done
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -843,6 +702,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -854,10 +714,11 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -880,28 +741,23 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -915,9 +771,10 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA)
-
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(hamgmtlibdir) $(DESTDIR)$(clidir) $(DESTDIR)$(tsadir) $(DESTDIR)$(adapterdir) $(DESTDIR)$(jardir)
+	for dir in "$(DESTDIR)$(hamgmtlibdir)" "$(DESTDIR)$(clidir)" "$(DESTDIR)$(tsadir)" "$(DESTDIR)$(adapterdir)" "$(DESTDIR)$(jardir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -938,7 +795,7 @@
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -953,12 +810,14 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -967,12 +826,20 @@
 	install-hamgmtlibLTLIBRARIES install-jarDATA \
 	install-tsaPROGRAMS
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -994,24 +861,28 @@
 ps-am:
 
 uninstall-am: uninstall-adapterSCRIPTS uninstall-cliPROGRAMS \
-	uninstall-hamgmtlibLTLIBRARIES uninstall-info-am \
-	uninstall-jarDATA uninstall-tsaPROGRAMS
+	uninstall-hamgmtlibLTLIBRARIES uninstall-jarDATA \
+	uninstall-tsaPROGRAMS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-cliPROGRAMS \
 	clean-generic clean-hamgmtlibLTLIBRARIES clean-libtool \
 	clean-noinstPROGRAMS clean-tsaPROGRAMS ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-adapterSCRIPTS install-am install-cliPROGRAMS \
-	install-data install-data-am install-exec install-exec-am \
-	install-hamgmtlibLTLIBRARIES install-info install-info-am \
-	install-jarDATA install-man install-strip install-tsaPROGRAMS \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-adapterSCRIPTS install-am install-cliPROGRAMS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-hamgmtlibLTLIBRARIES \
+	install-html install-html-am install-info install-info-am \
+	install-jarDATA install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip install-tsaPROGRAMS \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-adapterSCRIPTS uninstall-am \
 	uninstall-cliPROGRAMS uninstall-hamgmtlibLTLIBRARIES \
-	uninstall-info-am uninstall-jarDATA uninstall-tsaPROGRAMS
+	uninstall-jarDATA uninstall-tsaPROGRAMS
 
 
 ${swig_gen_files}: ha_mgmt_client.i
--- /dev/null
+++ b/version.Debian
@@ -0,0 +1 @@
+2.1.3
--- /dev/null
+++ b/ylwrap
@@ -0,0 +1,223 @@
+#! /bin/sh
+# ylwrap - wrapper for lex/yacc invocations.
+
+scriptversion=2005-05-14.22
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005
+#   Free Software Foundation, Inc.
+#
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+case "$1" in
+  '')
+    echo "$0: No files given.  Try \`$0 --help' for more information." 1>&2
+    exit 1
+    ;;
+  --basedir)
+    basedir=$2
+    shift 2
+    ;;
+  -h|--h*)
+    cat <<\EOF
+Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
+
+Wrapper for lex/yacc invocations, renaming files as desired.
+
+  INPUT is the input file
+  OUTPUT is one file PROG generates
+  DESIRED is the file we actually want instead of OUTPUT
+  PROGRAM is program to run
+  ARGS are passed to PROG
+
+Any number of OUTPUT,DESIRED pairs may be used.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v|--v*)
+    echo "ylwrap $scriptversion"
+    exit $?
+    ;;
+esac
+
+
+# The input.
+input="$1"
+shift
+case "$input" in
+  [\\/]* | ?:[\\/]*)
+    # Absolute path; do nothing.
+    ;;
+  *)
+    # Relative path.  Make it absolute.
+    input="`pwd`/$input"
+    ;;
+esac
+
+pairlist=
+while test "$#" -ne 0; do
+  if test "$1" = "--"; then
+    shift
+    break
+  fi
+  pairlist="$pairlist $1"
+  shift
+done
+
+# The program to run.
+prog="$1"
+shift
+# Make any relative path in $prog absolute.
+case "$prog" in
+  [\\/]* | ?:[\\/]*) ;;
+  *[\\/]*) prog="`pwd`/$prog" ;;
+esac
+
+# FIXME: add hostname here for parallel makes that run commands on
+# other machines.  But that might take us over the 14-char limit.
+dirname=ylwrap$$
+trap "cd `pwd`; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
+mkdir $dirname || exit 1
+
+cd $dirname
+
+case $# in
+  0) $prog "$input" ;;
+  *) $prog "$@" "$input" ;;
+esac
+ret=$?
+
+if test $ret -eq 0; then
+  set X $pairlist
+  shift
+  first=yes
+  # Since DOS filename conventions don't allow two dots,
+  # the DOS version of Bison writes out y_tab.c instead of y.tab.c
+  # and y_tab.h instead of y.tab.h. Test to see if this is the case.
+  y_tab_nodot="no"
+  if test -f y_tab.c || test -f y_tab.h; then
+    y_tab_nodot="yes"
+  fi
+
+  # The directory holding the input.
+  input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
+  # Quote $INPUT_DIR so we can use it in a regexp.
+  # FIXME: really we should care about more than `.' and `\'.
+  input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
+
+  while test "$#" -ne 0; do
+    from="$1"
+    # Handle y_tab.c and y_tab.h output by DOS
+    if test $y_tab_nodot = "yes"; then
+      if test $from = "y.tab.c"; then
+    	from="y_tab.c"
+      else
+    	if test $from = "y.tab.h"; then
+    	  from="y_tab.h"
+    	fi
+      fi
+    fi
+    if test -f "$from"; then
+      # If $2 is an absolute path name, then just use that,
+      # otherwise prepend `../'.
+      case "$2" in
+    	[\\/]* | ?:[\\/]*) target="$2";;
+    	*) target="../$2";;
+      esac
+
+      # We do not want to overwrite a header file if it hasn't
+      # changed.  This avoid useless recompilations.  However the
+      # parser itself (the first file) should always be updated,
+      # because it is the destination of the .y.c rule in the
+      # Makefile.  Divert the output of all other files to a temporary
+      # file so we can compare them to existing versions.
+      if test $first = no; then
+	realtarget="$target"
+	target="tmp-`echo $target | sed s/.*[\\/]//g`"
+      fi
+      # Edit out `#line' or `#' directives.
+      #
+      # We don't want the resulting debug information to point at
+      # an absolute srcdir; it is better for it to just mention the
+      # .y file with no path.
+      #
+      # We want to use the real output file name, not yy.lex.c for
+      # instance.
+      #
+      # We want the include guards to be adjusted too.
+      FROM=`echo "$from" | sed \
+            -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
+            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
+      TARGET=`echo "$2" | sed \
+            -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
+            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
+
+      sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
+          -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$?
+
+      # Check whether header files must be updated.
+      if test $first = no; then
+	if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
+	  echo "$2" is unchanged
+	  rm -f "$target"
+	else
+          echo updating "$2"
+          mv -f "$target" "$realtarget"
+        fi
+      fi
+    else
+      # A missing file is only an error for the first file.  This
+      # is a blatant hack to let us support using "yacc -d".  If -d
+      # is not specified, we don't want an error when the header
+      # file is "missing".
+      if test $first = yes; then
+        ret=1
+      fi
+    fi
+    shift
+    shift
+    first=no
+  done
+else
+  ret=$?
+fi
+
+# Remove the directory.
+cd ..
+rm -rf $dirname
+
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
